[[ Bug 19097 ]] Ensure all menus are updated after mouseDown to group

runrevmark · runrevmark · commit 1e52b10d946d · 2017-01-16T17:21:39.000Z
This patch ensures that all menus in the menubar are rebuilt after
the mouseDown message has been sent to the menubar group. This fixes
the problem where only the menu which was clicked on would be rebuilt,
causing all other menus to be stale.
diff --git a/docs/notes/bugfix-19097.md b/docs/notes/bugfix-19097.md
@@ -0,0 +1,2 @@
+# Ensure all menus are updated after mouseDown to menu group
+
diff --git a/engine/src/desktop-menu.cpp b/engine/src/desktop-menu.cpp
@@ -935,17 +935,30 @@ void MCPlatformHandleMenuUpdate(MCPlatformMenuRef p_menu)
         MCRedrawUnlockScreen();
 	}
 	
-    // SN-2014-11-10: [[ Bug 13836 ]] Make sure that
-	// Now we've got the menu to update, process the new menu spec, but only if the
-	// menu button still exists!
-	if (!t_update_menubar && s_menubar_targets[t_parent_menu_index].IsValid())
-	{
-		MCButton *t_button = s_menubar_targets[t_parent_menu_index];
-		
-		MCPlatformRemoveAllMenuItems(p_menu);
-		MCstacks -> deleteaccelerator(t_button, t_button -> getstack());
-		populate_menubar_menu_from_button(s_menubar, t_parent_menu_index, p_menu, t_button);
-	}
+    // We only send one message - to the group - to rebuild the menus. Therefore,
+    // after this is done we must rebuild all menubar menus at once.
+	if (!t_update_menubar)
+    {
+        uindex_t t_count;
+        MCPlatformCountMenuItems(s_menubar, t_count);
+        for(uindex_t i = 0; i < t_count; i++)
+        {
+            MCPlatformMenuRef t_menu;
+            MCPlatformGetMenuItemProperty(s_menubar, i, kMCPlatformMenuItemPropertySubmenu, kMCPlatformPropertyTypeMenuRef, &t_menu);
+            
+            // Always remove all items - we can't delete the menu if the button has
+            // been deleted as it might be referenced by Cocoa still.
+            MCPlatformRemoveAllMenuItems(t_menu);
+            
+            // Only rebuild the menu if the button still exists.
+            if (s_menubar_targets[i].IsValid())
+            {
+                MCButton *t_button = s_menubar_targets[i];
+                MCstacks -> deleteaccelerator(t_button, t_button -> getstack());
+                populate_menubar_menu_from_button(s_menubar, i, t_menu, t_button);
+            }
+        }
+    }
 }
 
 void MCPlatformHandleMenuSelect(MCPlatformMenuRef p_menu, uindex_t p_item_index)
diff --git a/engine/src/mac-menu.mm b/engine/src/mac-menu.mm
@@ -692,6 +692,19 @@ void MCPlatformGetMenuItemProperty(MCPlatformMenuRef p_menu, uindex_t p_index, M
 		case kMCPlatformMenuItemPropertyTag:
 			/* UNCHECKED */ MCStringCreateWithCFString((CFStringRef)[t_item representedObject], *(MCStringRef*)r_value);
 			break;
+        case kMCPlatformMenuItemPropertySubmenu:
+        {
+            NSMenu *t_current_submenu = [t_item submenu];
+            
+            MCPlatformMenuRef t_current_submenu_ref = nil;
+            if (t_current_submenu != nil)
+            {
+                t_current_submenu_ref = [(MCMenuDelegate *)[t_current_submenu delegate] platformMenuRef];
+            }
+            *(MCPlatformMenuRef *)r_value = t_current_submenu_ref;
+        }
+        break;
+            
 		default:
 			assert(false);
 			break;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Ensure all menus are updated after mouseDown to menu group`
	`2`	`+`