Changeset 8d1bcd7 in mainline for uspace/lib/ui/private

Timestamp:

2023-09-26T20:26:55Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5afc1aa

Parents:

ed1a948

Message:

Handover between system menu and menu bar

We can move between them using Left and Right keys in either closed
or open state. One can now open system menu with F10, Left, Down in
a window with menu bar, or just F10 in a window without menu bar.

Location:

uspace/lib/ui/private

Files:

• menubar.h (modified) (1 diff)
• wdecor.h (modified) (1 diff)
• window.h (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_left(ui_menu_bar_t *, sysarg_t);
 extern void ui_menu_bar_right(ui_menu_bar_t *, sysarg_t);

uspace/lib/ui/private/wdecor.h

@@ -99 +99 @@
 } ui_wdecor_geom_t;
 
-extern void ui_wdecor_sysmenu(ui_wdecor_t *, sysarg_t);
+extern void ui_wdecor_sysmenu_open(ui_wdecor_t *, sysarg_t);
+extern void ui_wdecor_sysmenu_left(ui_wdecor_t *, sysarg_t);
+extern void ui_wdecor_sysmenu_right(ui_wdecor_t *, sysarg_t);
+extern void ui_wdecor_sysmenu_accel(ui_wdecor_t *, char32_t, sysarg_t);
 extern void ui_wdecor_minimize(ui_wdecor_t *);
 extern void ui_wdecor_maximize(ui_wdecor_t *);

uspace/lib/ui/private/window.h

@@ -102 +102 @@
         /** System menu maximize entry */
         struct ui_menu_entry *sysmenu_maximize;
+        /** Menu bar */
+        struct ui_menu_bar *mbar;
         /** Top-level control in the application area */
         struct ui_control *control;