aboutsummaryrefslogtreecommitdiff
path: root/graphics/macgui
diff options
context:
space:
mode:
authorEugene Sandulenko2019-10-02 01:09:49 +0200
committerEugene Sandulenko2019-10-02 01:09:49 +0200
commitcf6e509cc9d737edb0ac6b43fae714459e50ab4c (patch)
tree9bc8736e9618d8a4b02a57719cd342d719046857 /graphics/macgui
parentbd7aa647de713df4a77ac02662bda7e40e03006f (diff)
downloadscummvm-rg350-cf6e509cc9d737edb0ac6b43fae714459e50ab4c.tar.gz
scummvm-rg350-cf6e509cc9d737edb0ac6b43fae714459e50ab4c.tar.bz2
scummvm-rg350-cf6e509cc9d737edb0ac6b43fae714459e50ab4c.zip
GRAPHICS: MACGUI: Render submenus recursively
Diffstat (limited to 'graphics/macgui')
-rw-r--r--graphics/macgui/macmenu.cpp3
-rw-r--r--graphics/macgui/macmenu.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp
index d06aa57896..522144fe3e 100644
--- a/graphics/macgui/macmenu.cpp
+++ b/graphics/macgui/macmenu.cpp
@@ -684,6 +684,9 @@ void MacMenu::renderSubmenu(MacMenuSubMenu *menu) {
y += kMenuDropdownItemHeight;
}
+ if (menu->subitems[_activeSubItem]->submenu != nullptr)
+ renderSubmenu(menu->subitems[_activeSubItem]->submenu);
+
_contentIsDirty = true;
//g_system->copyRectToScreen(_screen.getBasePtr(r->left, r->top), _screen.pitch, r->left, r->top, r->width() + 2, r->height() + 2);
}
diff --git a/graphics/macgui/macmenu.h b/graphics/macgui/macmenu.h
index ad02b2312a..2ff2bf0ba8 100644
--- a/graphics/macgui/macmenu.h
+++ b/graphics/macgui/macmenu.h
@@ -112,6 +112,7 @@ private:
bool _isVisible;
int _activeItem;
+ Common::Array<int> _menustack;
int _activeSubItem;
void (*_ccallback)(int action, Common::String &text, void *data);