RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 19:47:44 +00:00
Code Issues Activity Actions

LibGUI: Make propagate_shortcuts handle different level of propagation

Browse source 
First, this patch renames the function
`propagate_shortcuts_up_to_application` to `propagate_shortcuts`.
Handling those levels, will allow us to differentiate shortcuts at
`Window` level and `Application` level. Which will be convenient to
handle dialog-specific shortcuts.
This commit is contained in:
Lucas CHOLLET 2023-03-08 18:31:53 -05:00 • committed by Jelle Raaijmakers
parent 0b14ef134d
commit baac824ee3
4 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -479,7 +479,7 @@ void Window::handle_multi_paint_event(MultiPaintEvent& event)
ConnectionToWindowServer::the().async_did_finish_painting(m_window_id, rects); ConnectionToWindowServer::the().async_did_finish_painting(m_window_id, rects);
} }
void Window::propagate_shortcuts_up_to_application(KeyEvent& event, Widget* widget) void Window::propagate_shortcuts(KeyEvent& event, Widget* widget, ShortcutPropagationBoundary boundary)
{ {
VERIFY(event.type() == Event::KeyDown); VERIFY(event.type() == Event::KeyDown);
auto shortcut = Shortcut(event.modifiers(), event.key()); auto shortcut = Shortcut(event.modifiers(), event.key());
@ -497,9 +497,9 @@ void Window::propagate_shortcuts_up_to_application(KeyEvent& event, Widget* widg
} while (widget); } while (widget);
} }
if (!action) if (!action && boundary >= ShortcutPropagationBoundary::Window)
action = action_for_shortcut(shortcut); action = action_for_shortcut(shortcut);
if (!action) if (!action && boundary >= ShortcutPropagationBoundary::Application)
action = Application::the()->action_for_shortcut(shortcut); action = Application::the()->action_for_shortcut(shortcut);
if (action) { if (action) {
@ -533,7 +533,7 @@ void Window::handle_key_event(KeyEvent& event)
// Only process shortcuts if this is a keydown event. // Only process shortcuts if this is a keydown event.
if (event.type() == Event::KeyDown) if (event.type() == Event::KeyDown)
propagate_shortcuts_up_to_application(event, nullptr); propagate_shortcuts(event, nullptr, PropagationLimit::Application);
} }
void Window::handle_resize_event(ResizeEvent& event) void Window::handle_resize_event(ResizeEvent& event)

7
Userland/Libraries/LibGUI/Window.h
View file

@ -229,7 +229,12 @@ public:
void set_always_on_top(bool always_on_top = true); void set_always_on_top(bool always_on_top = true);
void propagate_shortcuts_up_to_application(KeyEvent& event, Widget* widget); enum class ShortcutPropagationBoundary {
Window,
Application,
};
void propagate_shortcuts(KeyEvent& event, Widget* widget, ShortcutPropagationBoundary = ShortcutPropagationBoundary::Application);
protected: protected:
Window(Core::Object* parent = nullptr); Window(Core::Object* parent = nullptr);

2
Userland/Libraries/LibVT/TerminalWidget.cpp
View file

@ -208,7 +208,7 @@ void TerminalWidget::keydown_event(GUI::KeyEvent& event)
{ {
// We specifically need to process shortcuts before input to the Terminal is done // We specifically need to process shortcuts before input to the Terminal is done
// since otherwise escape sequences will eat all our shortcuts for dinner. // since otherwise escape sequences will eat all our shortcuts for dinner.
window()->propagate_shortcuts_up_to_application(event, this); window()->propagate_shortcuts(event, this);
if (event.is_accepted()) if (event.is_accepted())
return; return;

2
Userland/Libraries/LibWebView/OutOfProcessWebView.cpp
View file

@ -751,7 +751,7 @@ void OutOfProcessWebView::notify_server_did_finish_handling_input_event(bool eve
// NOTE: If other events can ever trigger shortcuts, propagate those here. // NOTE: If other events can ever trigger shortcuts, propagate those here.
if (!event.is_accepted() && event.type() == GUI::Event::Type::KeyDown) if (!event.is_accepted() && event.type() == GUI::Event::Type::KeyDown)
window()->propagate_shortcuts_up_to_application(event, this); window()->propagate_shortcuts(event, this);
} }
}, },
[this](GUI::MouseEvent& event) { [this](GUI::MouseEvent& event) {