Changeset 61643c8 in mainline

Timestamp:

2023-09-13T17:32:23Z (8 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

112f70a

Parents:

1af103e

Message:

Fix accelerator keys not working when Caps Lock is enabled

Location:

uspace/lib/ui/src

Files:

• menu.c (modified) (2 diffs)
• menubar.c (modified) (2 diffs)

uspace/lib/ui/src/menu.c

@@ -35 +35 @@
 
 #include <adt/list.h>
+#include <ctype.h>
 #include <errno.h>
 #include <gfx/color.h>
@@ -541 +542 @@
                         while (mentry != NULL) {
                                 c = ui_menu_entry_get_accel(mentry);
-                                if (c == event->c && menu->selected != NULL) {
+                                if (c == (char32_t)tolower(event->c) &&
+                                    menu->selected != NULL) {
                                         ui_menu_entry_activate(mentry);
                                         break;

uspace/lib/ui/src/menubar.c

@@ -35 +35 @@
 
 #include <adt/list.h>
+#include <ctype.h>
 #include <errno.h>
 #include <gfx/color.h>
@@ -414 +415 @@
         while (mdd != NULL) {
                 maccel = ui_menu_dd_get_accel(mdd);
-                if (c == maccel) {
+                if ((char32_t)tolower(c) == maccel) {
                         ui_menu_bar_select(mbar, mdd, true, kbd_id);
                         return;