Changeset 112f70a in mainline for uspace/lib/ui/src/menu.c

Timestamp:

2023-09-14T09:53:27Z (9 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8a6ebbb

Parents:

61643c8

git-author:

Jiri Svoboda <jiri@…> (2023-09-13 18:53:09)

git-committer:

Jiri Svoboda <jiri@…> (2023-09-14 09:53:27)

Message:

Allow menu entries to be disabled

File:

• uspace/lib/ui/src/menu.c (modified) (2 diffs)

uspace/lib/ui/src/menu.c

@@ -534 +534 @@
                 break;
         case KC_ENTER:
-                if (menu->selected != NULL)
+                if (menu->selected != NULL &&
+                    !ui_menu_entry_is_disabled(menu->selected))
                         ui_menu_entry_activate(menu->selected);
                 break;
@@ -543 +544 @@
                                 c = ui_menu_entry_get_accel(mentry);
                                 if (c == (char32_t)tolower(event->c) &&
-                                    menu->selected != NULL) {
+                                    !ui_menu_entry_is_disabled(mentry)) {
                                         ui_menu_entry_activate(mentry);
                                         break;