libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-03 17:33:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GRAPHICS: MACGUI: Render nested submenus

Browse Source
This commit is contained in:
Eugene Sandulenko 2019-10-02 19:25:31 +02:00
parent 62f186b499
commit 1ced332fde
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
graphics/macgui/macmenu.cpp
View File

@ -792,43 +792,46 @@ bool MacMenu::mouseClick(int x, int y) {
if (_bbox.contains(x, y)) {
for (uint i = 0; i < _items.size(); i++)
if (_items[i]->bbox.contains(x, y)) {
if ((uint)_activeItem == i)
if ((uint)_activeItem == i)
return false;
if (_activeItem != -1) { // Restore background
if (_items[_activeItem]->submenu != nullptr) {
Common::Rect r(_items[_activeItem]->submenu->bbox);
r.right += 3;
r.bottom += 3;
_wm->setFullRefresh(true);
_menustack.pop_back(); // Drop previous submenu
}
}
_activeItem = i;
_activeSubItem = -1;
if (_items[_activeItem]->submenu != nullptr) {
_menustack.push_back(_items[_activeItem]->submenu);
}
_menuActivated = true;
_contentIsDirty = true;
return true;
}
} else if (_menuActivated && _items[_activeItem]->submenu != nullptr &&
_items[_activeItem]->submenu->bbox.contains(x, y)) {
MacMenuSubMenu *it = _items[_activeItem]->submenu;
} else if (_menuActivated && _menustack.size() > 0 && _menustack.back()->bbox.contains(x, y)) {
MacMenuSubMenu *it = _menustack.back();
int numSubItem = (y - it->bbox.top) / kMenuDropdownItemHeight;
if (numSubItem != _activeSubItem) {
_activeSubItem = numSubItem;
renderSubmenu(_items[_activeItem]->submenu);
renderSubmenu(it);
_contentIsDirty = true;
}
} else if (_menuActivated && _activeItem != -1) {
} else if (_menuActivated && _activeItem != -1 && _activeSubItem != -1) {
_activeSubItem = -1;
renderSubmenu(_items[_activeItem]->submenu);
_contentIsDirty = true;
if (_menustack.size()) {
renderSubmenu(_menustack.back());
_contentIsDirty = true;
}
}
return false;

2
graphics/macgui/macmenu.h
View File

@ -117,7 +117,7 @@ private:
bool _isVisible;
int _activeItem;
Common::Array<int> _menustack;
Common::Array<MacMenuSubMenu *> _menustack;
int _activeSubItem;
void (*_ccallback)(int action, Common::String &text, void *data);