summaryrefslogtreecommitdiff
path: root/src/ui
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/util.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/ui/util.c b/src/ui/util.c
index bdbbb98e..0adaebb6 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -705,6 +705,9 @@ static iBool menuHandler_(iWidget *menu, const char *cmd) {
705 closeMenu_Widget(menu); 705 closeMenu_Widget(menu);
706 return iTrue; 706 return iTrue;
707 } 707 }
708 if (equal_Command(cmd, "cancel") && pointerLabel_Command(cmd, "menu") == menu) {
709 return iFalse;
710 }
708 if (equal_Command(cmd, "contextclick") && pointer_Command(cmd) == menu) { 711 if (equal_Command(cmd, "contextclick") && pointer_Command(cmd) == menu) {
709 return iFalse; 712 return iFalse;
710 } 713 }
@@ -1074,7 +1077,7 @@ void openMenuFlags_Widget(iWidget *d, iInt2 windowCoord, int menuOpenFlags) {
1074 const iBool isPortraitPhone = (isPhone && isPortrait_App()); 1077 const iBool isPortraitPhone = (isPhone && isPortrait_App());
1075 const iBool isSlidePanel = (flags_Widget(d) & horizontalOffset_WidgetFlag) != 0; 1078 const iBool isSlidePanel = (flags_Widget(d) & horizontalOffset_WidgetFlag) != 0;
1076 if (postCommands) { 1079 if (postCommands) {
1077 postCommand_App("cancel"); /* dismiss any other menus */ 1080 postCommandf_App("cancel menu:%p", d); /* dismiss any other menus */
1078 } 1081 }
1079 /* Menu closes when commands are emitted, so handle any pending ones beforehand. */ 1082 /* Menu closes when commands are emitted, so handle any pending ones beforehand. */
1080 processEvents_App(postedEventsOnly_AppEventMode); 1083 processEvents_App(postedEventsOnly_AppEventMode);