diff options
| author | Eugene Sandulenko | 2016-01-13 21:52:53 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-01-13 21:52:53 +0100 |
| commit | ab1fdb518f73d5d56125ec8cfb70b465ba513a6d (patch) | |
| tree | 97a4ff5d0f59d9a99198dd2f01883c4a72a2bb3a /engines/wage | |
| parent | 1c3a4e3dbb6659e46292db6507e249723c701b68 (diff) | |
| download | scummvm-rg350-ab1fdb518f73d5d56125ec8cfb70b465ba513a6d.tar.gz scummvm-rg350-ab1fdb518f73d5d56125ec8cfb70b465ba513a6d.tar.bz2 scummvm-rg350-ab1fdb518f73d5d56125ec8cfb70b465ba513a6d.zip | |
WAGE: Menu fixes for fallback fonts
Diffstat (limited to 'engines/wage')
| -rw-r--r-- | engines/wage/menu.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/wage/menu.cpp b/engines/wage/menu.cpp index db6a365651..959d50fb97 100644 --- a/engines/wage/menu.cpp +++ b/engines/wage/menu.cpp @@ -153,7 +153,7 @@ Menu::Menu(Gui *gui) : _gui(gui) { // Calculate menu dimensions _font = getMenuFont(); - int y = _gui->_builtInFonts ? 3 : 1; + int y = 1; int x = 18; for (int i = 0; i < _items.size(); i++) { @@ -163,7 +163,7 @@ Menu::Menu(Gui *gui) : _gui(gui) { _items[i]->bbox.left = x - kMenuLeftMargin; _items[i]->bbox.top = y; _items[i]->bbox.right = x + w + kMenuSpacing - kMenuLeftMargin; - _items[i]->bbox.bottom = y + _font->getFontHeight() + 2; + _items[i]->bbox.bottom = y + _font->getFontHeight() + (_gui->_builtInFonts ? 3 : 2); } calcMenuBounds(_items[i]); @@ -260,7 +260,7 @@ void Menu::render() { renderSubmenu(it); } - _font->drawString(&_gui->_screen, it->name, it->bbox.left + kMenuLeftMargin, it->bbox.top + 1, it->bbox.width(), color); + _font->drawString(&_gui->_screen, it->name, it->bbox.left + kMenuLeftMargin, it->bbox.top + (_gui->_builtInFonts ? 2 : 1), it->bbox.width(), color); } g_system->copyRectToScreen(_gui->_screen.getPixels(), _gui->_screen.pitch, 0, 0, _gui->_screen.w, kMenuHeight); @@ -291,7 +291,7 @@ void Menu::renderSubmenu(MenuItem *menu) { int color = kColorBlack; if (i == _activeSubItem && menu->subitems[_activeSubItem]->text.size()) { color = kColorWhite; - Common::Rect trect(r->left, y, r->right, y + _font->getFontHeight()); + Common::Rect trect(r->left, y - (_gui->_builtInFonts ? 1 : 0), r->right, y + _font->getFontHeight()); Design::drawFilledRect(&_gui->_screen, trect, kColorBlack, _patterns, 1); } |