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

LibGUI: Allow GUI::Action to swallow key events when disabled

Browse source 
Sometimes an action should be disabled and the KeyEvent not posted to
the app's event loop nonetheless. In other words the action swallows the
KeyEvent without being activated.

Specific use-case: Terminal's Ctrl+Shift+{C,V}.
This commit is contained in:
Linus Groh 2020-12-06 20:53:29 +00:00 • committed by Andreas Kling
parent 253aa7aa7d
commit 886fe7e69f
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Libraries/LibGUI/Action.h
View file

@ -132,6 +132,9 @@ public:
}
void set_checked(bool);
bool swallow_key_event_when_disabled() const { return m_swallow_key_event_when_disabled; }
void set_swallow_key_event_when_disabled(bool swallow) { m_swallow_key_event_when_disabled = swallow; }
void register_button(Badge<Button>, Button&);
void unregister_button(Badge<Button>, Button&);
void register_menu_item(Badge<MenuItem>, MenuItem&);
@ -159,6 +162,7 @@ private:
bool m_enabled { true };
bool m_checkable { false };
bool m_checked { false };
bool m_swallow_key_event_when_disabled { false };
ShortcutScope m_scope { ShortcutScope::None };
HashTable<Button*> m_buttons;

6
Libraries/LibGUI/WindowServerConnection.cpp
View file

@ -173,10 +173,14 @@ void WindowServerConnection::handle(const Messages::WindowClient::KeyDown& messa
#endif
}
if (action && action->is_enabled()) {
if (action) {
if (action->is_enabled()) {
action->activate();
return;
}
if (action->swallow_key_event_when_disabled())
return;
}
bool focused_widget_accepts_emoji_input = window->focused_widget() && window->focused_widget()->accepts_emoji_input();
if (focused_widget_accepts_emoji_input && (message.modifiers() == (Mod_Ctrl | Mod_Alt)) && message.key() == Key_Space) {