Changeset 96c6a00 in mainline for uspace/lib/ui/src/menubar.c

Timestamp:

2022-03-10T13:44:10Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c88d7f99

Parents:

ca2680d

git-author:

Jiri Svoboda <jiri@…> (2022-03-09 18:44:00)

git-committer:

Jiri Svoboda <jiri@…> (2022-03-10 13:44:10)

Message:

Menu accelerators

Open a menu by pressing F10, then accelerator key (e.g. 'F').

File:

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

uspace/lib/ui/src/menubar.c

@@ -252 +252 @@
         old_menu = mbar->selected;
 
-        if (mbar->selected != menu)
-                mbar->selected = menu;
-        else
-                mbar->selected = NULL;
+        mbar->selected = menu;
 
         /* Close previously open menu */
@@ -333 +330 @@
 {
         gfx_rect_t rect;
+        ui_menu_t *menu;
+        char32_t maccel;
 
         if (event->key == KC_F10) {
@@ -361 +360 @@
 
                 return ui_claimed;
+        }
+
+        if (event->c != '\0' && !ui_menu_is_open(mbar->selected)) {
+                /* Check if it is an accelerator. */
+
+                menu = ui_menu_first(mbar);
+                while (menu != NULL) {
+                        maccel = ui_menu_get_accel(menu);
+                        if (event->c == maccel) {
+                                ui_menu_bar_select(mbar, menu, true);
+                                return ui_claimed;
+                        }
+
+                        menu = ui_menu_next(menu);
+                }
         }
 
@@ -428 +442 @@
                     gfx_pix_inside_rect(&ppos, &rect)) {
                         mbar->active = true;
-                        ui_menu_bar_select(mbar, menu, true);
+
+                        /* Open the menu, close if already open. */
+                        if (menu == mbar->selected)
+                                ui_menu_bar_select(mbar, NULL, false);
+                        else
+                                ui_menu_bar_select(mbar, menu, true);
+
                         return ui_claimed;
                 }