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

LibGUI: Search for actions with a Shortcut instead of for KeyEvent

Browse source 
Instead of having widget/window/application create a shortcut from a
KeyEvent within their find methods, we'll just pass them a Shortcut
so that the "where to search" logic doesn't need to be duplicated
for different Shortcut types.

It also lets us handle invalid Shortcut rejection at a higher level,
with most things letting the caller be responsible for not searching
for actions with an invalid shortcut.
This commit is contained in:
Geordie Hall 2022-02-05 18:39:34 +11:00 • committed by Linus Groh
parent a252c3e058
commit 737c1c86dc
8 changed files with 16 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -904,14 +904,8 @@ bool Widget::is_backmost() const
return &parent->children().first() == this;
}
Action* Widget::action_for_key_event(KeyEvent const& event)
Action* Widget::action_for_shortcut(Shortcut const& shortcut)
{
Shortcut shortcut(event.modifiers(), (KeyCode)event.key());
if (!shortcut.is_valid()) {
return nullptr;
}
Action* found_action = nullptr;
for_each_child_of_type<Action>([&](auto& action) {
if (action.shortcut() == shortcut || action.alternate_shortcut() == shortcut) {