Changeset 1543d4c in mainline

Timestamp:

2023-10-16T17:47:29Z (15 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4030072

Parents:

9e240c1

Message:

Properly close drop-down menu on second menu-bar entry click

Note that this does not work in console due to current limitations
in libui's window emulation.

Location:

uspace

Files:

• lib/ui/src/menubar.c (modified) (1 diff)
• srv/hid/display/seat.c (modified) (3 diffs)

uspace/lib/ui/src/menubar.c

@@ -563 +563 @@
                         mbar->active = true;
 
-                        /* Open the menu, close if already open. */
-                        if (mdd == mbar->selected)
-                                ui_menu_bar_select(mbar, NULL, false, pos_id);
-                        else
+                        /* Open the menu, if not already open. */
+                        if (mdd != mbar->selected)
                                 ui_menu_bar_select(mbar, mdd, true, pos_id);
 

uspace/srv/hid/display/seat.c

@@ -515 +515 @@
         wnd = ds_display_window_by_pos(seat->display, &seat->pntpos);
 
-        /* Click outside popup window */
-        if (event->type == POS_PRESS && wnd != seat->popup) {
-                /* Close popup window */
-                ds_seat_set_popup(seat, NULL);
-        }
-
         /* Deliver event to popup window. */
-        if (seat->popup != NULL) {
+        if (seat->popup != NULL && event->type != POS_PRESS) {
                 rc = ds_window_post_pos_event(seat->popup, event);
                 if (rc != EOK)
@@ -546 +540 @@
                  * to the same window above.
                  */
-                if (wnd != seat->popup) {
+                if (wnd != seat->popup || event->type == POS_PRESS) {
                         rc = ds_window_post_pos_event(wnd, event);
                         if (rc != EOK)
@@ -556 +550 @@
         }
 
+        /* Click outside popup window */
+        if (event->type == POS_PRESS && wnd != seat->popup) {
+                /* Close popup window */
+                ds_seat_set_popup(seat, NULL);
+        }
+
         return EOK;
 }