WAGE: Fix menu dropdown dimensions

scummvm · Jan 13, 2016 · a1e9c82 · a1e9c82
1 parent b911c63
commit a1e9c82
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/engines/wage/gui.h b/engines/wage/gui.h
@@ -67,8 +67,8 @@ enum {
 	kMenuHeight = 20,
 	kMenuLeftMargin = 7,
 	kMenuSpacing = 13,
-	kMenuPadding = 6,
-	kMenuDropdownPadding = 6,
+	kMenuPadding = 16,
+	kMenuDropdownPadding = 12,
 	kMenuDropdownItemHeight = 19,
 	kMenuItemHeight = 20,
 	kBorderWidth = 17,

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