[[ Bug 14541 ]] Wait for menu to close before returning from MCWidgetExecPopupMenuAtLocation

livecodeian · livecodeian · commit b000886552a5 · 2015-02-25T23:52:35.000Z
diff --git a/engine/src/button.cpp b/engine/src/button.cpp
@@ -3835,6 +3835,15 @@ void MCButton::setupmenu()
 	flags = MENU_FLAGS;
 }
 
+bool MCButton::menuisopen()
+{
+#ifdef _MAC_DESKTOP
+	return macmenuisopen();
+#else
+	return menu != nil && menu->getopened();
+#endif
+}
+
 bool MCButton::selectedchunk(MCStringRef& r_string)
 {
     MCExecContext ctxt(nil, nil, nil);
diff --git a/engine/src/button.h b/engine/src/button.h
@@ -303,6 +303,9 @@ class MCButton : public MCControl
 	MCRange getmenurange();
 	void docascade(MCStringRef t_pick);
 	void setupmenu();
+	
+	bool menuisopen();
+	
 	bool selectedchunk(MCStringRef& r_string);
 	bool selectedline(MCStringRef& r_string);
 	bool selectedtext(MCStringRef& r_string);
@@ -335,6 +338,8 @@ class MCButton : public MCControl
 	void macopenmenu(void);
 	void macfreemenu(void);
     static void getmacmenuitemtextfromaccelerator(MCPlatformMenuRef menu, KeySym key, uint1 mods, MCStringRef &r_string, bool issubmenu);
+    
+    bool macmenuisopen();
 #endif
 
 	MCCdata *getcdata(void) {return bdata;}
diff --git a/engine/src/desktop-menu.cpp b/engine/src/desktop-menu.cpp
@@ -502,6 +502,11 @@ void MCButton::getmacmenuitemtextfromaccelerator(MCPlatformMenuRef menu, KeySym
 {
 }
 
+bool MCButton::macmenuisopen()
+{
+	return m_system_menu != nil;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 // This structure holds info about each currently set main menu.
diff --git a/engine/src/widget.cpp b/engine/src/widget.cpp
@@ -2131,6 +2131,15 @@ extern "C" MC_DLLEXPORT MCStringRef MCWidgetExecPopupMenuAtLocation(MCStringRef
 	
 	MCInterfaceExecPopupButton(ctxt, t_button, t_at_ptr);
 
+	while (t_button->menuisopen() && !MCquit)
+	{
+		MCU_resetprops(True);
+		// MW-2011-09-08: [[ Redraw ]] Make sure we flush any updates.
+		MCRedrawUpdateScreen();
+		MCscreen->siguser();
+		MCscreen->wait(REFRESH_INTERVAL, True, True);
+	}
+	
 	t_button->SetVisible(ctxt, 0, false);
 	t_button->del();
 	t_button->scheduledelete();

Original file line number	Diff line number	Diff line change
`@@ -502,6 +502,11 @@ void MCButton::getmacmenuitemtextfromaccelerator(MCPlatformMenuRef menu, KeySym`
`502`	`502`	`{`
`503`	`503`	`}`
`504`	`504`
	`505`	`+bool MCButton::macmenuisopen()`
	`506`	`+{`
	`507`	`+ return m_system_menu != nil;`
	`508`	`+}`
	`509`	`+`
`505`	`510`	`////////////////////////////////////////////////////////////////////////////////`
`506`	`511`
`507`	`512`	`// This structure holds info about each currently set main menu.`