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

PaintBrush: Tidy up the UI a bit. Add some more colors.

Browse source
This commit is contained in:
Andreas Kling 2019-06-11 20:37:58 +02:00
parent 1372f10dda
commit 70564a78b2
4 changed files with 63 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Applications/PaintBrush/PaintableWidget.cpp
View file

@ -6,7 +6,7 @@ PaintableWidget::PaintableWidget(GWidget* parent)
: GWidget(parent) : GWidget(parent)
{ {
set_fill_with_background_color(true); set_fill_with_background_color(true);
set_background_color(Color::LightGray); set_background_color(Color::DarkGray);
m_bitmap = GraphicsBitmap::create(GraphicsBitmap::Format::RGB32, { 600, 400 }); m_bitmap = GraphicsBitmap::create(GraphicsBitmap::Format::RGB32, { 600, 400 });
m_bitmap->fill(Color::White); m_bitmap->fill(Color::White);
} }

80
Applications/PaintBrush/PaletteWidget.cpp
View file

@ -2,13 +2,16 @@
#include "PaintableWidget.h" #include "PaintableWidget.h"
#include <LibGUI/GBoxLayout.h> #include <LibGUI/GBoxLayout.h>
class ColorWidget : public GWidget { class ColorWidget : public GFrame {
public: public:
explicit ColorWidget(Color color, PaletteWidget& palette_widget, GWidget* parent) explicit ColorWidget(Color color, PaletteWidget& palette_widget, GWidget* parent)
: GWidget(parent) : GFrame(parent)
, m_palette_widget(palette_widget) , m_palette_widget(palette_widget)
, m_color(color) , m_color(color)
{ {
set_frame_thickness(2);
set_frame_shadow(FrameShadow::Sunken);
set_frame_shape(FrameShape::Container);
} }
virtual ~ColorWidget() override virtual ~ColorWidget() override
@ -34,44 +37,79 @@ PaletteWidget::PaletteWidget(PaintableWidget& paintable_widget, GWidget* parent)
{ {
set_frame_shape(FrameShape::Panel); set_frame_shape(FrameShape::Panel);
set_frame_shadow(FrameShadow::Raised); set_frame_shadow(FrameShadow::Raised);
set_frame_thickness(1); set_frame_thickness(0);
set_fill_with_background_color(true); set_fill_with_background_color(true);
set_background_color(Color::LightGray); set_background_color(Color::LightGray);
set_size_policy(SizePolicy::Fill, SizePolicy::Fixed); set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
set_preferred_size({ 0, 32 }); set_preferred_size({ 0, 34 });
m_secondary_color_widget = new GWidget(this); m_secondary_color_widget = new GFrame(this);
m_secondary_color_widget->set_relative_rect({ 2, 2, 60, 28 }); m_secondary_color_widget->set_frame_thickness(2);
m_secondary_color_widget->set_frame_shape(FrameShape::Container);
m_secondary_color_widget->set_frame_shadow(FrameShadow::Sunken);
m_secondary_color_widget->set_relative_rect({ 2, 2, 60, 31 });
m_secondary_color_widget->set_fill_with_background_color(true); m_secondary_color_widget->set_fill_with_background_color(true);
set_secondary_color(paintable_widget.secondary_color()); set_secondary_color(paintable_widget.secondary_color());
m_primary_color_widget = new GWidget(this); m_primary_color_widget = new GFrame(this);
Rect rect { 0, 0, 38, 14 }; m_primary_color_widget->set_frame_thickness(2);
m_primary_color_widget->set_frame_shape(FrameShape::Container);
m_primary_color_widget->set_frame_shadow(FrameShadow::Sunken);
Rect rect { 0, 0, 38, 15 };
rect.center_within(m_secondary_color_widget->relative_rect()); rect.center_within(m_secondary_color_widget->relative_rect());
m_primary_color_widget->set_relative_rect(rect); m_primary_color_widget->set_relative_rect(rect);
m_primary_color_widget->set_fill_with_background_color(true); m_primary_color_widget->set_fill_with_background_color(true);
set_primary_color(paintable_widget.primary_color()); set_primary_color(paintable_widget.primary_color());
auto* color_container = new GWidget(this); auto* color_container = new GWidget(this);
color_container->set_relative_rect(m_secondary_color_widget->relative_rect().right() + 2, 2, 500, 28); color_container->set_relative_rect(m_secondary_color_widget->relative_rect().right() + 2, 2, 500, 32);
color_container->set_layout(make<GBoxLayout>(Orientation::Horizontal)); color_container->set_layout(make<GBoxLayout>(Orientation::Vertical));
color_container->layout()->set_spacing(0); color_container->layout()->set_spacing(1);
auto add_color_widget = [&] (Color color) { auto* top_color_container = new GWidget(color_container);
auto* color_widget = new ColorWidget(color, *this, color_container); top_color_container->set_layout(make<GBoxLayout>(Orientation::Horizontal));
top_color_container->layout()->set_spacing(1);
auto* bottom_color_container = new GWidget(color_container);
bottom_color_container->set_layout(make<GBoxLayout>(Orientation::Horizontal));
bottom_color_container->layout()->set_spacing(1);
auto add_color_widget = [&] (GWidget* container, Color color) {
auto* color_widget = new ColorWidget(color, *this, container);
color_widget->set_fill_with_background_color(true); color_widget->set_fill_with_background_color(true);
color_widget->set_background_color(color); color_widget->set_background_color(color);
}; };
add_color_widget(Color::Black); add_color_widget(top_color_container, Color::from_rgb(0x000000));
add_color_widget(Color::White); add_color_widget(top_color_container, Color::from_rgb(0x808080));
add_color_widget(Color::Red); add_color_widget(top_color_container, Color::from_rgb(0x800000));
add_color_widget(Color::Green); add_color_widget(top_color_container, Color::from_rgb(0x808000));
add_color_widget(Color::Blue); add_color_widget(top_color_container, Color::from_rgb(0x008000));
add_color_widget(Color::Cyan); add_color_widget(top_color_container, Color::from_rgb(0x008080));
add_color_widget(Color::Magenta); add_color_widget(top_color_container, Color::from_rgb(0x000080));
add_color_widget(Color::Yellow); add_color_widget(top_color_container, Color::from_rgb(0x800080));
add_color_widget(top_color_container, Color::from_rgb(0x808040));
add_color_widget(top_color_container, Color::from_rgb(0x004040));
add_color_widget(top_color_container, Color::from_rgb(0x0080ff));
add_color_widget(top_color_container, Color::from_rgb(0x004080));
add_color_widget(top_color_container, Color::from_rgb(0x8000ff));
add_color_widget(top_color_container, Color::from_rgb(0x804000));
add_color_widget(bottom_color_container, Color::from_rgb(0xffffff));
add_color_widget(bottom_color_container, Color::from_rgb(0xc0c0c0));
add_color_widget(bottom_color_container, Color::from_rgb(0xff0000));
add_color_widget(bottom_color_container, Color::from_rgb(0xffff00));
add_color_widget(bottom_color_container, Color::from_rgb(0x00ff00));
add_color_widget(bottom_color_container, Color::from_rgb(0x00ffff));
add_color_widget(bottom_color_container, Color::from_rgb(0x0000ff));
add_color_widget(bottom_color_container, Color::from_rgb(0xff00ff));
add_color_widget(bottom_color_container, Color::from_rgb(0xffff80));
add_color_widget(bottom_color_container, Color::from_rgb(0x00ff80));
add_color_widget(bottom_color_container, Color::from_rgb(0x80ffff));
add_color_widget(bottom_color_container, Color::from_rgb(0x8080ff));
add_color_widget(bottom_color_container, Color::from_rgb(0xff0080));
add_color_widget(bottom_color_container, Color::from_rgb(0xff8040));
} }
PaletteWidget::~PaletteWidget() PaletteWidget::~PaletteWidget()

4
Applications/PaintBrush/PaletteWidget.h
View file

@ -16,6 +16,6 @@ public:
private: private:
PaintableWidget& m_paintable_widget; PaintableWidget& m_paintable_widget;
GWidget* m_primary_color_widget { nullptr }; GFrame* m_primary_color_widget { nullptr };
GWidget* m_secondary_color_widget { nullptr }; GFrame* m_secondary_color_widget { nullptr };
}; };

2
Applications/PaintBrush/main.cpp
View file

@ -13,7 +13,7 @@ int main(int argc, char** argv)
auto* window = new GWindow; auto* window = new GWindow;
window->set_title("PaintBrush"); window->set_title("PaintBrush");
window->set_rect(100, 100, 600, 432); window->set_rect(100, 100, 600, 434);
auto* main_widget = new GWidget(nullptr); auto* main_widget = new GWidget(nullptr);
window->set_main_widget(main_widget); window->set_main_widget(main_widget);