Changeset d7f82635 in mainline for uspace/lib/ui/src/menu.c

Timestamp:

2021-06-10T13:22:33Z (4 years ago)

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

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

Children:

98735eb

Parents:

5823aef3

git-author:

Jiri Svoboda <jiri@…> (2021-06-04 20:02:36)

git-committer:

jxsvoboda <5887334+jxsvoboda@…> (2021-06-10 13:22:33)

Message:

Deliver close event to popup window when appropriate

That is, when focus changes or when user clicks outside of the
popup window.

File:

• uspace/lib/ui/src/menu.c (modified) (2 diffs)

uspace/lib/ui/src/menu.c

@@ -61 +61 @@
 };
 
+static void ui_menu_popup_close(ui_popup_t *, void *);
 static void ui_menu_popup_pos(ui_popup_t *, void *, pos_event_t *);
 
 static ui_popup_cb_t ui_menu_popup_cb = {
+        .close = ui_menu_popup_close,
         .pos = ui_menu_popup_pos
 };
@@ -366 +368 @@
         } else {
                 /* Press outside menu - close it */
-//              if (event->type == POS_PRESS)
-//                      ui_menu_bar_select(menu->mbar, NULL, NULL);
+                if (event->type == POS_PRESS)
+                        ui_menu_bar_select(menu->mbar, NULL, NULL);
         }
 
         return ui_unclaimed;
+}
+
+/** Handle close event in menu popup window.
+ *
+ * @param popup Menu popup window
+ * @param arg Argument (ui_menu_t *)
+ */
+static void ui_menu_popup_close(ui_popup_t *popup, void *arg)
+{
+        ui_menu_t *menu = (ui_menu_t *)arg;
+
+        /* Close the menu */
+        ui_menu_bar_select(menu->mbar, NULL, NULL);
 }