diff options
| author | Eugene Sandulenko | 2016-01-18 21:58:31 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-02-14 17:12:47 +0100 |
| commit | 40eb91da3ce5d3bd96f749ebc749238d364cc15d (patch) | |
| tree | a2c175a4d0635026e752d47a21dea812dfe8efb4 | |
| parent | f428f597887b6d96c6832250d4a713ede92e4b04 (diff) | |
| download | scummvm-rg350-40eb91da3ce5d3bd96f749ebc749238d364cc15d.tar.gz scummvm-rg350-40eb91da3ce5d3bd96f749ebc749238d364cc15d.tar.bz2 scummvm-rg350-40eb91da3ce5d3bd96f749ebc749238d364cc15d.zip | |
WAGE: More menu finetuning
| -rw-r--r-- | engines/wage/gui.cpp | 8 | ||||
| -rw-r--r-- | engines/wage/gui.h | 4 | ||||
| -rw-r--r-- | engines/wage/menu.cpp | 11 |
3 files changed, 14 insertions, 9 deletions
diff --git a/engines/wage/gui.cpp b/engines/wage/gui.cpp index b5edafd1fc..0c83852a00 100644 --- a/engines/wage/gui.cpp +++ b/engines/wage/gui.cpp @@ -257,13 +257,13 @@ void Gui::draw() { _scene->paint(&_screen, _scene->_designBounds->left, _scene->_designBounds->top); - _sceneArea.left = _scene->_designBounds->left + kBorderWidth; - _sceneArea.top = _scene->_designBounds->top + kBorderWidth; + _sceneArea.left = _scene->_designBounds->left + kBorderWidth - 2; + _sceneArea.top = _scene->_designBounds->top + kBorderWidth - 2; _sceneArea.setWidth(_scene->_designBounds->width() - 2 * kBorderWidth); _sceneArea.setHeight(_scene->_designBounds->height() - 2 * kBorderWidth); - _consoleTextArea.left = _scene->_textBounds->left + kBorderWidth; - _consoleTextArea.top = _scene->_textBounds->top + kBorderWidth; + _consoleTextArea.left = _scene->_textBounds->left + kBorderWidth - 2; + _consoleTextArea.top = _scene->_textBounds->top + kBorderWidth - 2; _consoleTextArea.setWidth(_scene->_textBounds->width() - 2 * kBorderWidth); _consoleTextArea.setHeight(_scene->_textBounds->height() - 2 * kBorderWidth); } diff --git a/engines/wage/gui.h b/engines/wage/gui.h index 53722d5cf8..4494771466 100644 --- a/engines/wage/gui.h +++ b/engines/wage/gui.h @@ -68,8 +68,8 @@ enum { kMenuLeftMargin = 7, kMenuSpacing = 13, kMenuPadding = 16, - kMenuDropdownPadding = 12, - kMenuDropdownItemHeight = 15, + kMenuDropdownPadding = 14, + kMenuDropdownItemHeight = 16, kMenuItemHeight = 20, kBorderWidth = 17, kDesktopArc = 7, diff --git a/engines/wage/menu.cpp b/engines/wage/menu.cpp index 65bc30321c..b5066acd10 100644 --- a/engines/wage/menu.cpp +++ b/engines/wage/menu.cpp @@ -335,9 +335,9 @@ int Menu::calculateMenuWidth(MenuItem *menu) { void Menu::calcMenuBounds(MenuItem *menu) { // TODO: cache maxWidth int maxWidth = calculateMenuWidth(menu); - int x1 = menu->bbox.left; + int x1 = menu->bbox.left - 1; int y1 = menu->bbox.bottom + 1; - int x2 = x1 + maxWidth + kMenuDropdownPadding * 2; + int x2 = x1 + maxWidth + kMenuDropdownPadding * 2 - 4; int y2 = y1 + menu->subitems.size() * kMenuDropdownItemHeight + 2; menu->subbbox.left = x1; @@ -360,7 +360,12 @@ void Menu::render() { MenuItem *it = _items[i]; if (_activeItem == i) { - Design::drawFilledRect(&_gui->_screen, it->bbox, kColorBlack, _gui->_patterns, kPatternSolid); + Common::Rect hbox = it->bbox; + + hbox.left -= 1; + hbox.right += 2; + + Design::drawFilledRect(&_gui->_screen, hbox, kColorBlack, _gui->_patterns, kPatternSolid); color = kColorWhite; if (it->subitems.size()) |