From cf6e509cc9d737edb0ac6b43fae714459e50ab4c Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Wed, 2 Oct 2019 01:09:49 +0200 Subject: GRAPHICS: MACGUI: Render submenus recursively --- graphics/macgui/macmenu.cpp | 3 +++ graphics/macgui/macmenu.h | 1 + 2 files changed, 4 insertions(+) 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 _menustack; int _activeSubItem; void (*_ccallback)(int action, Common::String &text, void *data); -- cgit v1.2.3