Changeset 4034954c in mainline for uspace/lib/ui/src/window.c

Timestamp:

2023-09-27T20:01:51Z (10 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.

File:

• uspace/lib/ui/src/window.c (modified) (5 diffs)

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);
+        }
 }