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

CtrlLib: MenuItem icon placement now centered

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@9812 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2016-05-08 06:55:34 +00:00
parent 0c18010edf
commit 3bb399e8db
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
uppsrc/CtrlLib/MenuItem.cpp
View file

@ -308,17 +308,14 @@ void MenuItem::Paint(Draw& w)
}
}
Size isz = li.GetSize();
// Size isz = min(maxiconsize, imsz);
// if(isz != imsz)
// li = CachedRescale(li, isz);
int iy = (sz.cy - isz.cy) / 2;
bool chk = false;
int x = Zx(3);
int x = max(Zx(3), (leftgap + textgap - isz.cx) / 2);
if(!licon.IsEmpty() && type) {
chk = type == CHECK1 || type == RADIO1;
if(GUI_GlobalStyle() >= GUISTYLE_XP) {
if(chk && !hl)
DrawXPButton(w, RectC(0, iy - Zy(2), isz.cx + Zx(4), isz.cy + Zy(4)),
DrawXPButton(w, RectC(x - Zx(2), iy - Zy(2), isz.cx + Zx(4), isz.cy + Zy(4)),
BUTTON_EDGE|BUTTON_CHECKED);
}
else {
@ -332,7 +329,7 @@ void MenuItem::Paint(Draw& w)
DrawHighlightImage(w, x, iy, li, hl || chk, true);
else
w.DrawImage(x, iy, DisabledImage(li));
x = max(isz.cx, leftgap) + textgap;
x = max(isz.cx + Zx(3), leftgap) + textgap;
isz = GetTextSize(text, StdFont());
DrawMenuText(w, x, (sz.cy - isz.cy) / 2, txt, font, isenabled, hl, style->menutext,
style->itemtext);