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

LibGUI: Allow CommandPalette to distinguish radio buttons and checkboxes

Browse source
This commit is contained in:
networkException 2022-01-29 18:38:53 +01:00 • committed by Andreas Kling
parent fe687412a6
commit 048ed64c26
1 changed files with 38 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,6 +7,7 @@
#include <AK/QuickSort.h> #include <AK/QuickSort.h>
#include <LibGUI/Action.h> #include <LibGUI/Action.h>
#include <LibGUI/ActionGroup.h>
#include <LibGUI/Application.h> #include <LibGUI/Application.h>
#include <LibGUI/BoxLayout.h> #include <LibGUI/BoxLayout.h>
#include <LibGUI/CommandPalette.h> #include <LibGUI/CommandPalette.h>
@ -20,22 +21,40 @@
namespace GUI { namespace GUI {
class IconOrRadioButtonDelegate final : public GUI::TableCellPaintingDelegate { enum class IconFlags : unsigned {
Checkable = 0,
Exclusive = 1,
Checked = 2,
};
AK_ENUM_BITWISE_OPERATORS(IconFlags);
class ActionIconDelegate final : public GUI::TableCellPaintingDelegate {
public: public:
virtual ~IconOrRadioButtonDelegate() override { } virtual ~ActionIconDelegate() override { }
bool should_paint(ModelIndex const& index) override bool should_paint(ModelIndex const& index) override
{ {
return index.data().is_bool(); return index.data().is_u32();
} }
virtual void paint(GUI::Painter& painter, Gfx::IntRect const& cell_rect, Gfx::Palette const& palette, ModelIndex const& index) override virtual void paint(GUI::Painter& painter, Gfx::IntRect const& cell_rect, Gfx::Palette const& palette, ModelIndex const& index) override
{ {
auto checked = index.data().as_bool(); auto flags = static_cast<IconFlags>(index.data().as_u32());
VERIFY(has_flag(flags, IconFlags::Checkable));
Gfx::IntRect radio_rect { 0, 0, 12, 12 }; auto exclusive = has_flag(flags, IconFlags::Exclusive);
radio_rect.center_within(cell_rect); auto checked = has_flag(flags, IconFlags::Checked);
Gfx::StylePainter::paint_radio_button(painter, radio_rect, palette, checked, false);
if (exclusive) {
Gfx::IntRect radio_rect { 0, 0, 12, 12 };
radio_rect.center_within(cell_rect);
Gfx::StylePainter::paint_radio_button(painter, radio_rect, palette, checked, false);
} else {
Gfx::IntRect radio_rect { 0, 0, 13, 13 };
radio_rect.center_within(cell_rect);
Gfx::StylePainter::paint_check_box(painter, radio_rect, palette, true, checked, false);
}
} }
}; };
@ -85,8 +104,17 @@ public:
case Column::Icon: case Column::Icon:
if (action.icon()) if (action.icon())
return *action.icon(); return *action.icon();
if (action.is_checkable()) if (action.is_checkable()) {
return action.is_checked(); auto flags = IconFlags::Checkable;
if (action.is_checked())
flags |= IconFlags::Checked;
if (action.group() && action.group()->is_exclusive())
flags |= IconFlags::Exclusive;
return (u32)flags;
}
return ""; return "";
case Column::Text: case Column::Text:
return Gfx::parse_ampersand_string(action.text()); return Gfx::parse_ampersand_string(action.text());
@ -135,7 +163,7 @@ CommandPalette::CommandPalette(GUI::Window& parent_window, ScreenPosition screen
m_filter_model = MUST(GUI::FilteringProxyModel::create(*m_model)); m_filter_model = MUST(GUI::FilteringProxyModel::create(*m_model));
m_filter_model->set_filter_term(""); m_filter_model->set_filter_term("");
m_table_view->set_column_painting_delegate(0, make<IconOrRadioButtonDelegate>()); m_table_view->set_column_painting_delegate(0, make<ActionIconDelegate>());
m_table_view->set_model(*m_filter_model); m_table_view->set_model(*m_filter_model);
m_text_box->on_change = [this] { m_text_box->on_change = [this] {