qi-hardware/gmenu2x
1
0
Fork 0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2024-11-22 17:51:34 +02:00
Code

In GMenu2X::drawButton, don't build a rectangle if we only need width

Browse Source
This commit is contained in:
Maarten ter Huurne 2014-08-15 16:34:06 +02:00
parent b202f1949a
commit c1d57b62de
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gmenu2x.cpp
View File

@ -1039,14 +1039,14 @@ int GMenu2X::drawButton(Surface& s, IconButton *btn, int x, int y) {
int GMenu2X::drawButton(Surface& s, const string &btn, const string &text, int x, int y) { int GMenu2X::drawButton(Surface& s, const string &btn, const string &text, int x, int y) {
if (y<0) y = resY+y; if (y<0) y = resY+y;
SDL_Rect re = { static_cast<Sint16>(x), static_cast<Sint16>(y - 7), 0, 16 }; int w = 0;
if (sc.skinRes("imgs/buttons/"+btn+".png") != NULL) { if (sc.skinRes("imgs/buttons/"+btn+".png") != NULL) {
sc["imgs/buttons/"+btn+".png"]->blit(s, x, y-7); sc["imgs/buttons/"+btn+".png"]->blit(s, x, y-7);
re.w = sc["imgs/buttons/"+btn+".png"]->width() + 3; w = sc["imgs/buttons/"+btn+".png"]->width() + 3;
re.w += font->write( w += font->write(
s, text, x+re.w, y, Font::HAlignLeft, Font::VAlignMiddle); s, text, x + w, y, Font::HAlignLeft, Font::VAlignMiddle);
} }
return x+re.w+6; return x + w + 6;
} }
int GMenu2X::drawButtonRight(Surface& s, const string &btn, const string &text, int x, int y) { int GMenu2X::drawButtonRight(Surface& s, const string &btn, const string &text, int x, int y) {