WindowServer: Don't allow activating disabled menu items with keyboard

This commit is contained in:
Andreas Kling 2020-04-24 17:29:42 +02:00
commit 9badcff1ba
Notes: sideshowbarker 2024-07-19 07:20:10 +09:00

View file

@ -393,6 +393,8 @@ void Menu::event(Core::Event& event)
} }
if (key == Key_Return) { if (key == Key_Return) {
if (!hovered_item()->is_enabled())
return;
if (hovered_item()->is_submenu()) if (hovered_item()->is_submenu())
descend_into_submenu_at_hovered_item(); descend_into_submenu_at_hovered_item();
else else
@ -461,7 +463,7 @@ void Menu::event(Core::Event& event)
} }
if (key == Key_Right) { if (key == Key_Right) {
if (hovered_item()->is_submenu()) if (hovered_item()->is_enabled() && hovered_item()->is_submenu())
descend_into_submenu_at_hovered_item(); descend_into_submenu_at_hovered_item();
return; return;
} }