Changeset 62223ec in mainline for uspace/lib/ui/src/menubar.c

Timestamp:

2021-04-09T22:41:22Z (3 years ago)

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

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

Children:

f251883

Parents:

0262f16c

git-author:

Jiri Svoboda <jiri@…> (2021-04-01 21:04:11)

git-committer:

jxsvoboda <5887334+jxsvoboda@…> (2021-04-09 22:41:22)

Message:

Close menu when window is unfocused

This of course means we need to do all the plumbing for delivering
unfocus event to UI controls.

File:

• uspace/lib/ui/src/menubar.c (modified) (4 diffs)

uspace/lib/ui/src/menubar.c

@@ -60 +60 @@
 static errno_t ui_menu_bar_ctl_paint(void *);
 static ui_evclaim_t ui_menu_bar_ctl_pos_event(void *, pos_event_t *);
+static void ui_menu_bar_ctl_unfocus(void *);
 
 /** Menu bar control ops */
@@ -65 +66 @@
         .destroy = ui_menu_bar_ctl_destroy,
         .paint = ui_menu_bar_ctl_paint,
-        .pos_event = ui_menu_bar_ctl_pos_event
+        .pos_event = ui_menu_bar_ctl_pos_event,
+        .unfocus = ui_menu_bar_ctl_unfocus
 };
 
@@ -328 +330 @@
 }
 
+/** Handle menu bar window unfocus notification.
+ *
+ * @param mbar Menu bar
+ */
+void ui_menu_bar_unfocus(ui_menu_bar_t *mbar)
+{
+        ui_menu_bar_select(mbar, NULL, NULL);
+}
+
 /** Destroy menu bar control.
  *
@@ -364 +375 @@
 }
 
+/** Handle menu bar control window unfocus notification.
+ *
+ * @param arg Argument (ui_menu_bar_t *)
+ */
+void ui_menu_bar_ctl_unfocus(void *arg)
+{
+        ui_menu_bar_t *mbar = (ui_menu_bar_t *) arg;
+
+        ui_menu_bar_unfocus(mbar);
+}
+
 /** @}
  */