From a247ceeecf87a7ed111d1a4d8d44bfc795d7956d Mon Sep 17 00:00:00 2001 From: cxl Date: Fri, 30 Sep 2011 17:36:49 +0000 Subject: [PATCH] *CtrlLib: MenuBar: Fixed position of leftgap separator when using LeftGap override git-svn-id: svn://ultimatepp.org/upp/trunk@3935 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/CtrlLib/MenuBar.cpp | 2 +- uppsrc/ide/LayDes/laydes.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/uppsrc/CtrlLib/MenuBar.cpp b/uppsrc/CtrlLib/MenuBar.cpp index 2f8a75567..9b1415404 100644 --- a/uppsrc/CtrlLib/MenuBar.cpp +++ b/uppsrc/CtrlLib/MenuBar.cpp @@ -89,7 +89,7 @@ void MenuBar::Paint(Draw& w) else PaintBar(w, style->breaksep, style->look); else - PaintBar(w, style->breaksep, style->popupbody, style->popupiconbar, style->leftgap); + PaintBar(w, style->breaksep, style->popupbody, style->popupiconbar, Nvl(leftgap, style->leftgap)); } Value MenuBar::GetBackground() const diff --git a/uppsrc/ide/LayDes/laydes.cpp b/uppsrc/ide/LayDes/laydes.cpp index a23e1b277..dd6bdbdd5 100644 --- a/uppsrc/ide/LayDes/laydes.cpp +++ b/uppsrc/ide/LayDes/laydes.cpp @@ -767,7 +767,7 @@ void LayDes::Group(Bar& bar, const String& group) Sort(type); int h = 3 * StdFont().Info().GetHeight() / 2; int w = 8 * h / 3; - ((MenuBar&)bar).LeftGap(w + 2); + ((MenuBar&)bar).LeftGap(w + 6); int q = 0; for(i = 0; i < type.GetCount(); i++) { bar.Add(type[i], GetTypeIcon(type[i], w, h, 0, SColorFace),