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

LibGUI: Show current and selected color comparison in ColorPicker

Browse source
This commit is contained in:
LepkoQQ 2020-08-25 22:38:59 +02:00 • committed by Andreas Kling
parent 9f5310d607
commit b10dde70b7
2 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Libraries/LibGUI/ColorPicker.cpp
View file

@ -245,18 +245,31 @@ void ColorPicker::build_ui_custom(Widget& root_container)
auto& vertical_container = horizontal_container.add<Widget>(); auto& vertical_container = horizontal_container.add<Widget>();
vertical_container.set_size_policy(SizePolicy::Fixed, SizePolicy::Fill); vertical_container.set_size_policy(SizePolicy::Fixed, SizePolicy::Fill);
vertical_container.set_layout<VerticalBoxLayout>(); vertical_container.set_layout<VerticalBoxLayout>();
vertical_container.layout()->set_margins({ 4, 0, 0, 0 }); vertical_container.layout()->set_margins({ 12, 0, 0, 0 });
vertical_container.set_preferred_size(150, 0); vertical_container.set_preferred_size(128, 0);
// Preview auto& preview_container = vertical_container.add<Frame>();
m_preview_widget = vertical_container.add<Frame>(); preview_container.set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
m_preview_widget->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed); preview_container.set_layout<VerticalBoxLayout>();
m_preview_widget->set_preferred_size(0, 150); preview_container.layout()->set_margins({ 2, 2, 2, 2 });
preview_container.layout()->set_spacing(0);
preview_container.set_preferred_size(0, 128);
// Current color
auto& current_color_widget = preview_container.add<Widget>();
current_color_widget.set_fill_with_background_color(true);
auto pal1 = current_color_widget.palette();
pal1.set_color(ColorRole::Background, m_color);
current_color_widget.set_palette(pal1);
// Preview selected color
m_preview_widget = preview_container.add<Widget>();
m_preview_widget->set_fill_with_background_color(true); m_preview_widget->set_fill_with_background_color(true);
auto pal = m_preview_widget->palette(); auto pal2 = m_preview_widget->palette();
pal.set_color(ColorRole::Background, m_color); pal2.set_color(ColorRole::Background, m_color);
m_preview_widget->set_palette(pal); m_preview_widget->set_palette(pal2);
vertical_container.layout()->add_spacer(); vertical_container.layout()->add_spacer();

2
Libraries/LibGUI/ColorPicker.h
View file

@ -58,7 +58,7 @@ private:
Vector<ColorButton*> m_color_widgets; Vector<ColorButton*> m_color_widgets;
RefPtr<CustomColorWidget> m_custom_color; RefPtr<CustomColorWidget> m_custom_color;
RefPtr<Frame> m_preview_widget; RefPtr<Widget> m_preview_widget;
RefPtr<TextBox> m_html_text; RefPtr<TextBox> m_html_text;
RefPtr<SpinBox> m_red_spinbox; RefPtr<SpinBox> m_red_spinbox;
RefPtr<SpinBox> m_green_spinbox; RefPtr<SpinBox> m_green_spinbox;