Changeset 5de852c in mainline for uspace/lib/ui/src/menubar.c

Timestamp:

2022-01-11T13:12:15Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bfc0fc6

Parents:

59768c7

git-author:

Jiri Svoboda <jiri@…> (2022-01-10 20:11:54)

git-committer:

Jiri Svoboda <jiri@…> (2022-01-11 13:12:15)

Message:

Coordinate keyboard event delivery between application and UI framework

If an application sets its own keyboard event handler, it needs to call
ui_window_def_kbd() to deliver events to the window's UI control tree.
Menubar should be able to capture these events so that they are not
accidentally acted upon by the application keyboard handler.

File:

• uspace/lib/ui/src/menubar.c (modified) (1 diff)

uspace/lib/ui/src/menubar.c

@@ -371 +371 @@
         if (event->type == KEY_PRESS && (event->mods &
             (KM_CTRL | KM_ALT | KM_SHIFT)) == 0) {
-                ui_menu_bar_key_press_unmod(mbar, event);
+                return ui_menu_bar_key_press_unmod(mbar, event);
+        }
+
+        if (mbar->active)
                 return ui_claimed;
-        }
-
-        return ui_claimed;
+
+        return ui_unclaimed;
 }