Changeset 4034954c in mainline

Timestamp:

2023-09-27T20:01:51Z (7 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e54de59

Parents:

5afc1aa

Message:

Do not forget to close system menu. Close first, open second!

When moving out of system menu to menu bar we would forget to
close it. This was only causing noticeable problems in text mode.
Also we first close the current menu, then open the other one,
as juggling multiple popup windows in text mode could cause problems.

Location:

uspace/lib/ui

Files:

• private/menubar.h (modified) (1 diff)
• src/menubar.c (modified) (9 diffs)
• src/window.c (modified) (5 diffs)
• test/menubar.c (modified) (1 diff)

uspace/lib/ui/private/menubar.h

@@ -67 +67 @@
 
 extern void ui_menu_bar_select(ui_menu_bar_t *, ui_menu_dd_t *, bool, sysarg_t);
-extern void ui_menu_bar_select_sysmenu(ui_menu_bar_t *, sysarg_t);
+extern void ui_menu_bar_select_sysmenu(ui_menu_bar_t *, bool, sysarg_t);
 extern void ui_menu_bar_left(ui_menu_bar_t *, sysarg_t);
 extern void ui_menu_bar_right(ui_menu_bar_t *, sysarg_t);

uspace/lib/ui/src/menubar.c

@@ -294 +294 @@
 }
 
+/** Select first drop-down.
+ *
+ * @param mbar Menu bar
+ * @param openup @c true to open drop-down if it was not open
+ * @param idev_id Input device ID
+ */
 void ui_menu_bar_select_first(ui_menu_bar_t *mbar, bool openup,
     sysarg_t idev_id)
@@ -303 +309 @@
 }
 
+/** Select last drop-down.
+ *
+ * @param mbar Menu bar
+ * @param openup @c true to open drop-down if it was not open
+ * @param idev_id Input device ID
+ */
 void ui_menu_bar_select_last(ui_menu_bar_t *mbar, bool openup,
     sysarg_t idev_id)
@@ -312 +324 @@
 }
 
-void ui_menu_bar_select_sysmenu(ui_menu_bar_t *mbar, sysarg_t idev_id)
-{
-        bool was_open;
-
+/** Select system menu.
+ *
+ * @param mbar Menu bar
+ * @param openup @c true to open drop-down if it was not open
+ * @param idev_id Input device ID
+ */
+void ui_menu_bar_select_sysmenu(ui_menu_bar_t *mbar, bool openup,
+    sysarg_t idev_id)
+{
         ui_wdecor_sysmenu_hdl_set_active(mbar->window->wdecor, true);
-        was_open = mbar->selected != NULL &&
-            ui_menu_dd_is_open(mbar->selected);
-
-        if (was_open)
+
+        if (openup)
                 ui_window_send_sysmenu(mbar->window, idev_id);
 }
@@ -335 +350 @@
 {
         ui_menu_dd_t *nmdd;
+        bool sel_sysmenu = false;
+        bool was_open;
 
         if (mbar->selected == NULL)
@@ -342 +359 @@
         if (nmdd == NULL) {
                 if ((mbar->window->wdecor->style & ui_wds_sysmenu_hdl) != 0) {
-                        ui_menu_bar_select_sysmenu(mbar, idev_id);
+                        sel_sysmenu = true;
                 } else {
                         nmdd = ui_menu_dd_last(mbar);
@@ -348 +365 @@
         }
 
+        was_open = mbar->selected != NULL &&
+            ui_menu_dd_is_open(mbar->selected);
+
         if (nmdd != mbar->selected)
                 ui_menu_bar_select(mbar, nmdd, false, idev_id);
+
+        /*
+         * Only open sysmenu *after* closing the previous menu, avoid
+         * having multiple popup windows at the same time.
+         */
+        if (sel_sysmenu)
+                ui_menu_bar_select_sysmenu(mbar, was_open, idev_id);
 }
 
@@ -363 +390 @@
 {
         ui_menu_dd_t *nmdd;
+        bool sel_sysmenu = false;
+        bool was_open;
 
         if (mbar->selected == NULL)
@@ -370 +399 @@
         if (nmdd == NULL) {
                 if ((mbar->window->wdecor->style & ui_wds_sysmenu_hdl) != 0) {
-                        ui_menu_bar_select_sysmenu(mbar, idev_id);
+                        sel_sysmenu = true;
                 } else {
                         nmdd = ui_menu_dd_first(mbar);
@@ -376 +405 @@
         }
 
+        was_open = mbar->selected != NULL &&
+            ui_menu_dd_is_open(mbar->selected);
+
         if (nmdd != mbar->selected)
                 ui_menu_bar_select(mbar, nmdd, false, idev_id);
+
+        /*
+         * Only open sysmenu *after* closing the previous menu, avoid
+         * having multiple popup windows at the same time.
+         */
+        if (sel_sysmenu)
+                ui_menu_bar_select_sysmenu(mbar, was_open, idev_id);
 }
 

uspace/lib/ui/src/window.c

@@ -1061 +1061 @@
 
         if (window->mbar != NULL) {
+                ui_wdecor_sysmenu_hdl_set_active(window->wdecor, false);
+                ui_menu_close(window->sysmenu);
                 ui_menu_bar_select_last(window->mbar, false, idev_id);
-                ui_wdecor_sysmenu_hdl_set_active(window->wdecor, false);
         }
 }
@@ -1077 +1078 @@
 
         if (window->mbar != NULL) {
+                ui_wdecor_sysmenu_hdl_set_active(window->wdecor, false);
+                ui_menu_close(window->sysmenu);
                 ui_menu_bar_select_first(window->mbar, false, idev_id);
-                ui_wdecor_sysmenu_hdl_set_active(window->wdecor, false);
         }
 }
@@ -1095 +1097 @@
 
         if (window->mbar != NULL) {
+                ui_wdecor_sysmenu_hdl_set_active(window->wdecor, false);
+                ui_menu_close(window->sysmenu);
                 ui_menu_bar_press_accel(window->mbar, c, idev_id);
-                ui_wdecor_sysmenu_hdl_set_active(window->wdecor, false);
         }
 }
@@ -1550 +1553 @@
         ui_window_t *window = (ui_window_t *)arg;
 
-        (void)sysmenu;
-
-        if (window->mbar != NULL)
+        if (window->mbar != NULL) {
+                ui_wdecor_sysmenu_hdl_set_active(window->wdecor, false);
+                ui_menu_close(sysmenu);
                 ui_menu_bar_select_last(window->mbar, true, idev_id);
+        }
 }
 
@@ -1566 +1570 @@
         ui_window_t *window = (ui_window_t *)arg;
 
-        (void)sysmenu;
-
-        if (window->mbar != NULL)
+        if (window->mbar != NULL) {
+                ui_wdecor_sysmenu_hdl_set_active(window->wdecor, false);
+                ui_menu_close(sysmenu);
                 ui_menu_bar_select_first(window->mbar, true, idev_id);
+        }
 }
 

uspace/lib/ui/test/menubar.c

@@ -453 +453 @@
         PCUT_ASSERT_NOT_NULL(mdd2);
 
-        ui_menu_bar_select_sysmenu(mbar, 0);
+        ui_menu_bar_select_sysmenu(mbar, false, 0);
         PCUT_ASSERT_TRUE(window->wdecor->sysmenu_hdl_active);