github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-09-10 03:54:54 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

*Docking: fixed compilation issue

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@3939 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2011-10-01 09:58:14 +00:00
parent c82b23c2c5
commit 97f8965cba
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
uppsrc/Docking/DockCont.cpp
View file

@ -143,7 +143,7 @@ void ImgButton::Paint(Draw &w)
// DockContHandle frame
int DockCont::DockContHandle::GetHandleSize(const DockableCtrl::Style &s) const
{
return (s.title_font.IsNull() ? 12 : s.title_font.GetHeight()+4)
return (!IsNull(s.title_font) ? 12 : s.title_font.GetHeight()+4)
+ (s.handle_vert ? s.handle_margins.GetWidth() : s.handle_margins.GetHeight());
}
/*
@ -204,7 +204,7 @@ void DockCont::DockContHandle::Paint(Draw& w)
p.x += isz + 2;
}
}
if (!s.title_font.IsNull()) {
if (!IsNull(s.title_font)) {
Ctrl *c = GetLastChild();
while (c && !c->IsShown() && c->GetParent())
c = c->GetPrev();

3
uppsrc/Docking/Docking.upp
View file

@ -24,6 +24,3 @@ file
src.tpp,
Docking.t charset "UTF-8";
mainconfig
"" = "GUI";