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

LibGUI: Allow only one CommandPalette at once to be opened

Browse source 
Previously it was possible to open CommandPalette for
a CommandPalette :^)
This commit is contained in:
Maciej 2022-01-30 19:13:39 +01:00 • committed by Andreas Kling
parent daec521010
commit 399d1ff961
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Userland/Libraries/LibGUI/WindowServerConnection.cpp
View file

@ -196,8 +196,9 @@ void WindowServerConnection::key_down(i32 window_id, u32 code_point, u32 key, u3
} }
// FIXME: This shortcut should be configurable. // FIXME: This shortcut should be configurable.
if (modifiers == (Mod_Ctrl | Mod_Shift) && key == Key_A) { if (!m_in_command_palette && modifiers == (Mod_Ctrl | Mod_Shift) && key == Key_A) {
auto command_palette = CommandPalette::construct(*window); auto command_palette = CommandPalette::construct(*window);
TemporaryChange change { m_in_command_palette, true };
if (command_palette->exec() != GUI::Dialog::ExecOK) if (command_palette->exec() != GUI::Dialog::ExecOK)
return; return;
auto* action = command_palette->selected_action(); auto* action = command_palette->selected_action();

1
Userland/Libraries/LibGUI/WindowServerConnection.h
View file

@ -58,6 +58,7 @@ private:
virtual void track_mouse_move(Gfx::IntPoint const&) override; virtual void track_mouse_move(Gfx::IntPoint const&) override;
virtual void ping() override; virtual void ping() override;
bool m_in_command_palette { false };
bool m_display_link_notification_pending { false }; bool m_display_link_notification_pending { false };
i32 m_client_id; i32 m_client_id;
}; };