*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
This commit is contained in:
cxl 2011-09-30 17:36:49 +00:00
parent 325c8943bd
commit a247ceeecf
2 changed files with 2 additions and 2 deletions

View file

@ -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

View file

@ -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),