RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 21:22:46 +00:00
Code Issues Activity Actions

WindowServer: Update alt shortcuts for menu items when text changes

Browse source 
WindowServer: Make CI happy :^)
This commit is contained in:
Alec Murphy 2022-11-01 18:00:19 -04:00 • committed by Andrew Kaster
parent f5a2603714
commit c2f3dead91
3 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Userland/Services/WindowServer/Menu.cpp
View file

@ -692,12 +692,22 @@ void Menu::set_visible(bool visible)
m_client->async_menu_visibility_did_change(m_menu_id, visible); m_client->async_menu_visibility_did_change(m_menu_id, visible);
} }
void Menu::update_alt_shortcuts_for_items()
{
m_alt_shortcut_character_to_item_indices.clear();
int i = 0;
for (auto& item : m_items) {
if (auto alt_shortcut = find_ampersand_shortcut_character(item.text())) {
m_alt_shortcut_character_to_item_indices.ensure(to_ascii_lowercase(alt_shortcut)).append(i);
}
++i;
}
}
void Menu::add_item(NonnullOwnPtr<MenuItem> item) void Menu::add_item(NonnullOwnPtr<MenuItem> item)
{ {
if (auto alt_shortcut = find_ampersand_shortcut_character(item->text())) {
m_alt_shortcut_character_to_item_indices.ensure(to_ascii_lowercase(alt_shortcut)).append(m_items.size());
}
m_items.append(move(item)); m_items.append(move(item));
update_alt_shortcuts_for_items();
} }
Vector<size_t> const* Menu::items_with_alt_shortcut(u32 alt_shortcut) const Vector<size_t> const* Menu::items_with_alt_shortcut(u32 alt_shortcut) const

1
Userland/Services/WindowServer/Menu.h
View file

@ -56,6 +56,7 @@ public:
return found_item; return found_item;
} }
void update_alt_shortcuts_for_items();
void add_item(NonnullOwnPtr<MenuItem>); void add_item(NonnullOwnPtr<MenuItem>);
String const& name() const { return m_name; } String const& name() const { return m_name; }

2
Userland/Services/WindowServer/Window.cpp
View file

@ -233,6 +233,8 @@ void Window::update_window_menu_items()
m_window_menu_close_item->set_enabled(m_closeable); m_window_menu_close_item->set_enabled(m_closeable);
m_window_menu_move_item->set_enabled(m_minimized_state == WindowMinimizedState::None && !is_maximized() && !m_fullscreen); m_window_menu_move_item->set_enabled(m_minimized_state == WindowMinimizedState::None && !is_maximized() && !m_fullscreen);
m_window_menu->update_alt_shortcuts_for_items();
} }
void Window::set_minimized(bool minimized) void Window::set_minimized(bool minimized)