libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-05 09:10:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

WAGE: Fix menu dropdown dimensions

Browse Source
This commit is contained in:
Eugene Sandulenko 2016-01-13 09:51:15 +01:00
parent b911c63750
commit a1e9c82579
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/wage/gui.h
View File

@ -67,8 +67,8 @@ enum {
kMenuHeight = 20, kMenuHeight = 20,
kMenuLeftMargin = 7, kMenuLeftMargin = 7,
kMenuSpacing = 13, kMenuSpacing = 13,
kMenuPadding = 6, kMenuPadding = 16,
kMenuDropdownPadding = 6, kMenuDropdownPadding = 12,
kMenuDropdownItemHeight = 19, kMenuDropdownItemHeight = 19,
kMenuItemHeight = 20, kMenuItemHeight = 20,
kBorderWidth = 17, kBorderWidth = 17,

8
engines/wage/menu.cpp
View File

@ -226,10 +226,10 @@ int Menu::calculateMenuWidth(MenuItem *menu) {
void Menu::calcMenuBounds(MenuItem *menu) { void Menu::calcMenuBounds(MenuItem *menu) {
// TODO: cache maxWidth // TODO: cache maxWidth
int maxWidth = calculateMenuWidth(menu); int maxWidth = calculateMenuWidth(menu);
int x1 = menu->bbox.left - kMenuDropdownPadding; int x1 = menu->bbox.left;
int y1 = menu->bbox.bottom; int y1 = menu->bbox.bottom;
int x2 = x1 + maxWidth + kMenuDropdownPadding * 3; int x2 = x1 + maxWidth + kMenuDropdownPadding * 2;
int y2 = y1 + menu->subitems.size() * kMenuDropdownItemHeight; int y2 = y1 + menu->subitems.size() * kMenuDropdownItemHeight - 3;
menu->subbbox.left = x1; menu->subbbox.left = x1;
menu->subbbox.top = y1; menu->subbbox.top = y1;
@ -272,7 +272,7 @@ void Menu::renderSubmenu(MenuItem *menu) {
Design::drawFilledRect(&_gui->_screen, *r, kColorWhite, _patterns, 1); Design::drawFilledRect(&_gui->_screen, *r, kColorWhite, _patterns, 1);
Design::drawRect(&_gui->_screen, *r, 1, kColorBlack, _patterns, 1); Design::drawRect(&_gui->_screen, *r, 1, kColorBlack, _patterns, 1);
int x = r->left + kMenuLeftMargin; int x = r->left + kMenuDropdownPadding;
int y = r->top; int y = r->top;
for (int i = 0; i < menu->subitems.size(); i++) { for (int i = 0; i < menu->subitems.size(); i++) {
_font->drawString(&_gui->_screen, menu->subitems[i]->text, x, y, r->width(), kColorBlack); _font->drawString(&_gui->_screen, menu->subitems[i]->text, x, y, r->width(), kColorBlack);