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

LibGUI: Alphabetize the available entries in CommandPalette

Browse source
This commit is contained in:
Andreas Kling 2022-01-27 20:03:52 +01:00
parent 30d4f4b010
commit 3c3c2334fa
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Userland/Libraries/LibGUI/CommandPalette.cpp
View file

@ -4,6 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <AK/QuickSort.h>
#include <LibGUI/Action.h> #include <LibGUI/Action.h>
#include <LibGUI/Application.h> #include <LibGUI/Application.h>
#include <LibGUI/BoxLayout.h> #include <LibGUI/BoxLayout.h>
@ -26,7 +27,7 @@ public:
__Count, __Count,
}; };
ActionModel(NonnullRefPtrVector<GUI::Action>& actions) ActionModel(Vector<NonnullRefPtr<GUI::Action>>& actions)
: m_actions(actions) : m_actions(actions)
{ {
} }
@ -49,7 +50,7 @@ public:
virtual ModelIndex index(int row, int column = 0, ModelIndex const& = ModelIndex()) const override virtual ModelIndex index(int row, int column = 0, ModelIndex const& = ModelIndex()) const override
{ {
return create_index(row, column, m_actions.ptr_at(row).ptr()); return create_index(row, column, m_actions.at(row).ptr());
} }
virtual Variant data(ModelIndex const& index, ModelRole role = ModelRole::Display) const override virtual Variant data(ModelIndex const& index, ModelRole role = ModelRole::Display) const override
@ -85,7 +86,7 @@ public:
} }
private: private:
NonnullRefPtrVector<GUI::Action> const& m_actions; Vector<NonnullRefPtr<GUI::Action>> const& m_actions;
}; };
CommandPalette::CommandPalette(GUI::Window& parent_window, ScreenPosition screen_position) CommandPalette::CommandPalette(GUI::Window& parent_window, ScreenPosition screen_position)
@ -170,6 +171,11 @@ void CommandPalette::collect_actions(GUI::Window& parent_window)
m_actions.clear(); m_actions.clear();
for (auto& action : actions) for (auto& action : actions)
m_actions.append(action); m_actions.append(action);
quick_sort(m_actions, [&](auto& a, auto& b) {
// FIXME: This is so awkward. Don't be so awkward.
return Gfx::parse_ampersand_string(a->text()) < Gfx::parse_ampersand_string(b->text());
});
} }
void CommandPalette::finish_with_index(GUI::ModelIndex const& filter_index) void CommandPalette::finish_with_index(GUI::ModelIndex const& filter_index)

2
Userland/Libraries/LibGUI/CommandPalette.h
View file

@ -26,7 +26,7 @@ private:
void finish_with_index(GUI::ModelIndex const&); void finish_with_index(GUI::ModelIndex const&);
RefPtr<GUI::Action> m_selected_action; RefPtr<GUI::Action> m_selected_action;
NonnullRefPtrVector<GUI::Action> m_actions; Vector<NonnullRefPtr<GUI::Action>> m_actions;
RefPtr<GUI::TextBox> m_text_box; RefPtr<GUI::TextBox> m_text_box;
RefPtr<GUI::TableView> m_table_view; RefPtr<GUI::TableView> m_table_view;