[Scummvm-git-logs] scummvm master -> dc487e34b430ab8d3256cbb2bf5ad859775d5c61

AndywinXp noreply at scummvm.org
Sun Nov 19 22:47:49 UTC 2023


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
dc487e34b4 SCUMM: MACGUI: Force the menu bar to be visible after selecting an item


Commit: dc487e34b430ab8d3256cbb2bf5ad859775d5c61
    https://github.com/scummvm/scummvm/commit/dc487e34b430ab8d3256cbb2bf5ad859775d5c61
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-11-19T23:47:42+01:00

Commit Message:
SCUMM: MACGUI: Force the menu bar to be visible after selecting an item

Changed paths:
    engines/scumm/gfx_mac.cpp


diff --git a/engines/scumm/gfx_mac.cpp b/engines/scumm/gfx_mac.cpp
index 8c43fa75c72..cc7acc0a51c 100644
--- a/engines/scumm/gfx_mac.cpp
+++ b/engines/scumm/gfx_mac.cpp
@@ -2502,10 +2502,13 @@ bool MacGui::handleMenu(int id, Common::String &name) {
 	if (id == 0)
 		return true;
 
-	// Originally, the menu bar would still be visible. I don't know how
-	// to replicate that effect.
+	// This is how we keep the menu bar visible.
+	Graphics::MacMenu *menu = _windowManager->getMenu();
+	menu->closeMenu();
+	menu->setActive(true);
+	menu->setVisible(true);
+	updateWindowManager();
 
-	_windowManager->getMenu()->closeMenu();
 	int saveSlotToHandle = -1;
 	Common::String savegameName;
 




More information about the Scummvm-git-logs mailing list