diff options
author | demostanis <demostanis@protonmail.com> | 2022-10-14 20:31:22 +0200 |
---|---|---|
committer | Linus Groh <mail@linusgroh.de> | 2022-10-25 10:21:18 +0100 |
commit | 28c1d7011f5f9c48c36be378fe8a3e73182253eb (patch) | |
tree | e113ad37a492c2b96883d7d19901220c69784da9 | |
parent | 6bb512d0b2135474e9dd88449d37ecc99629856e (diff) | |
download | serenity-28c1d7011f5f9c48c36be378fe8a3e73182253eb.zip |
LibGUI: Remove Window::set_blocks_command_palette()
Since the logic to open the command palette is now in the form of an
action, its keybinding is only bound when the window active. Thus, when
a combo box or the emoji input dialog is active, the window isn't, and
the command palette doesn't show up, without requiring special checks.
-rw-r--r-- | Userland/Libraries/LibGUI/ComboBox.cpp | 1 | ||||
-rw-r--r-- | Userland/Libraries/LibGUI/CommandPalette.cpp | 1 | ||||
-rw-r--r-- | Userland/Libraries/LibGUI/ConnectionToWindowServer.cpp | 18 | ||||
-rw-r--r-- | Userland/Libraries/LibGUI/EmojiInputDialog.cpp | 1 | ||||
-rw-r--r-- | Userland/Libraries/LibGUI/Window.h | 4 |
5 files changed, 0 insertions, 25 deletions
diff --git a/Userland/Libraries/LibGUI/ComboBox.cpp b/Userland/Libraries/LibGUI/ComboBox.cpp index 83d2124a87..dc8f3041c1 100644 --- a/Userland/Libraries/LibGUI/ComboBox.cpp +++ b/Userland/Libraries/LibGUI/ComboBox.cpp @@ -115,7 +115,6 @@ ComboBox::ComboBox() m_list_window = add<Window>(window()); m_list_window->set_frameless(true); m_list_window->set_window_mode(WindowMode::CaptureInput); - m_list_window->set_blocks_command_palette(true); m_list_window->on_active_input_change = [this](bool is_active_input) { if (!is_active_input) { m_open_button->set_enabled(false); diff --git a/Userland/Libraries/LibGUI/CommandPalette.cpp b/Userland/Libraries/LibGUI/CommandPalette.cpp index 244df8405b..df0ccdcc61 100644 --- a/Userland/Libraries/LibGUI/CommandPalette.cpp +++ b/Userland/Libraries/LibGUI/CommandPalette.cpp @@ -176,7 +176,6 @@ CommandPalette::CommandPalette(GUI::Window& parent_window, ScreenPosition screen : GUI::Dialog(&parent_window, screen_position) { set_frameless(true); - set_blocks_command_palette(true); set_blocks_emoji_input(true); resize(450, 300); diff --git a/Userland/Libraries/LibGUI/ConnectionToWindowServer.cpp b/Userland/Libraries/LibGUI/ConnectionToWindowServer.cpp index 6869a9a699..3aa4771321 100644 --- a/Userland/Libraries/LibGUI/ConnectionToWindowServer.cpp +++ b/Userland/Libraries/LibGUI/ConnectionToWindowServer.cpp @@ -202,24 +202,6 @@ void ConnectionToWindowServer::key_down(i32 window_id, u32 code_point, u32 key, return; } - bool accepts_command_palette = !window->blocks_command_palette(); - if (accepts_command_palette && window->focused_widget()) - accepts_command_palette = window->focused_widget()->accepts_command_palette(); - - // FIXME: This shortcut should be configurable. - if (accepts_command_palette && !m_in_command_palette && modifiers == (Mod_Ctrl | Mod_Shift) && key == Key_A) { - auto command_palette = CommandPalette::construct(*window); - command_palette->set_window_mode(GUI::WindowMode::CaptureInput); - TemporaryChange change { m_in_command_palette, true }; - if (command_palette->exec() != GUI::Dialog::ExecResult::OK) - return; - auto* action = command_palette->selected_action(); - VERIFY(action); - action->flash_menubar_menu(*window); - action->activate(); - return; - } - Core::EventLoop::current().post_event(*window, move(key_event)); } diff --git a/Userland/Libraries/LibGUI/EmojiInputDialog.cpp b/Userland/Libraries/LibGUI/EmojiInputDialog.cpp index 9e89a151fe..551af22f71 100644 --- a/Userland/Libraries/LibGUI/EmojiInputDialog.cpp +++ b/Userland/Libraries/LibGUI/EmojiInputDialog.cpp @@ -99,7 +99,6 @@ EmojiInputDialog::EmojiInputDialog(Window* parent_window) VERIFY_NOT_REACHED(); set_frameless(true); - set_blocks_command_palette(true); set_blocks_emoji_input(true); set_window_mode(GUI::WindowMode::CaptureInput); resize(400, 300); diff --git a/Userland/Libraries/LibGUI/Window.h b/Userland/Libraries/LibGUI/Window.h index 47834a8cae..12031d41a8 100644 --- a/Userland/Libraries/LibGUI/Window.h +++ b/Userland/Libraries/LibGUI/Window.h @@ -226,9 +226,6 @@ public: Menubar& menubar() { return *m_menubar; } Menubar const& menubar() const { return *m_menubar; } - void set_blocks_command_palette(bool b) { m_blocks_command_palette = b; } - bool blocks_command_palette() const { return m_blocks_command_palette; } - void set_blocks_emoji_input(bool b) { m_blocks_emoji_input = b; } bool blocks_emoji_input() const { return m_blocks_emoji_input; } @@ -316,7 +313,6 @@ private: bool m_visible_for_timer_purposes { true }; bool m_visible { false }; bool m_moved_by_client { false }; - bool m_blocks_command_palette { false }; bool m_blocks_emoji_input { false }; }; |