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

LibGUI: Actually use the Action alternate shortcut

Browse source 
This adds the actual functionality to Window and Application.
This commit is contained in:
Aatos Majava 2021-06-24 12:42:50 +03:00 • committed by Andreas Kling
parent 21a193ed5a
commit 3e6a5af32b
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibGUI/Application.cpp
View file

@ -113,11 +113,13 @@ void Application::quit(int exit_code)
void Application::register_global_shortcut_action(Badge<Action>, Action& action)
{
m_global_shortcut_actions.set(action.shortcut(), &action);
m_global_shortcut_actions.set(action.alternate_shortcut(), &action);
}
void Application::unregister_global_shortcut_action(Badge<Action>, Action& action)
{
m_global_shortcut_actions.remove(action.shortcut());
m_global_shortcut_actions.remove(action.alternate_shortcut());
}
Action* Application::action_for_key_event(const KeyEvent& event)

2
Userland/Libraries/LibGUI/Widget.cpp
View file

@ -829,7 +829,7 @@ Action* Widget::action_for_key_event(const KeyEvent& event)
Action* found_action = nullptr;
for_each_child_of_type<Action>([&](auto& action) {
if (action.shortcut() == shortcut) {
if (action.shortcut() == shortcut || action.alternate_shortcut() == shortcut) {
found_action = &action;
return IterationDecision::Break;
}

2
Userland/Libraries/LibGUI/Window.cpp
View file

@ -982,7 +982,7 @@ Action* Window::action_for_key_event(const KeyEvent& event)
Shortcut shortcut(event.modifiers(), (KeyCode)event.key());
Action* found_action = nullptr;
for_each_child_of_type<Action>([&](auto& action) {
if (action.shortcut() == shortcut) {
if (action.shortcut() == shortcut || action.alternate_shortcut() == shortcut) {
found_action = &action;
return IterationDecision::Break;
}