SerenityOS/serenity
1
0 Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2026-11-07 04:29:30 -10:00
Code Issues Packages Projects Releases Wiki Activity

WindowServer: Cycle through menu items with the same Alt shortcut

Browse Source 
If there are multiple items with the same Alt shortcut, cycle through
them with each keypress instead of activating immediately.
This commit is contained in:
Sergiy Stupar authored and Andreas Kling committed 2022-11-08 11:48:37 +01:00
1 parent 892186d058
commit 288d75fdab
2 files changed
+5 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Userland/Services/WindowServer/Menu.h
+1
View File
@@ -105,6 +105,7 @@ public:
void redraw(MenuItem const&);
MenuItem* hovered_item() const;
int hovered_item_index() const { return m_hovered_item_index; };
void set_hovered_index(int index, bool make_input = false);
Userland/Services/WindowServer/MenuManager.cpp
+4 -3
View File
@@ -68,11 +68,12 @@ void MenuManager::event(Core::Event& event)
if (auto* shortcut_item_indices = m_current_menu->items_with_alt_shortcut(key_event.code_point())) {
VERIFY(!shortcut_item_indices->is_empty());
// FIXME: If there are multiple items with the same Alt shortcut, we should cycle through them
// with each keypress instead of activating immediately.
auto index = shortcut_item_indices->at(0);
auto it = shortcut_item_indices->find_if([&](int const& i) { return i > m_current_menu->hovered_item_index(); });
auto index = shortcut_item_indices->at(it.is_end() ? 0 : it.index());
auto& item = m_current_menu->item(index);
m_current_menu->set_hovered_index(index);
if (shortcut_item_indices->size() > 1)
return;
if (item.is_submenu())
m_current_menu->descend_into_submenu_at_hovered_item();
else