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

PixelPaint: Move properties for EllipseTool to ToolPropertiesWidget

Browse source 
Remove the context menu for EllipseTool and use the properties widget
instead for consistency between tools.
This commit is contained in:
Marcus Nilsson 2021-08-02 21:08:03 +02:00 • committed by Andreas Kling
parent cb6e63e579
commit b257d8d284
2 changed files with 48 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

69
Userland/Applications/PixelPaint/EllipseTool.cpp
View file

@ -8,8 +8,12 @@
#include "ImageEditor.h" #include "ImageEditor.h"
#include "Layer.h" #include "Layer.h"
#include <LibGUI/Action.h> #include <LibGUI/Action.h>
#include <LibGUI/BoxLayout.h>
#include <LibGUI/Label.h>
#include <LibGUI/Menu.h> #include <LibGUI/Menu.h>
#include <LibGUI/Painter.h> #include <LibGUI/Painter.h>
#include <LibGUI/RadioButton.h>
#include <LibGUI/Slider.h>
#include <LibGfx/Rect.h> #include <LibGfx/Rect.h>
namespace PixelPaint { namespace PixelPaint {
@ -91,32 +95,51 @@ void EllipseTool::on_keydown(GUI::KeyEvent& event)
} }
} }
void EllipseTool::on_tool_button_contextmenu(GUI::ContextMenuEvent& event) GUI::Widget* EllipseTool::get_properties_widget()
{ {
if (!m_context_menu) { if (!m_properties_widget) {
m_context_menu = GUI::Menu::construct(); m_properties_widget = GUI::Widget::construct();
m_context_menu->add_action(GUI::Action::create("Outline", [this](auto&) { m_properties_widget->set_layout<GUI::VerticalBoxLayout>();
m_mode = Mode::Outline;
})); auto& thickness_container = m_properties_widget->add<GUI::Widget>();
m_context_menu->add_action(GUI::Action::create("Fill", [this](auto&) { thickness_container.set_fixed_height(20);
m_mode = Mode::Fill; thickness_container.set_layout<GUI::HorizontalBoxLayout>();
}));
m_context_menu->add_separator(); auto& thickness_label = thickness_container.add<GUI::Label>("Thickness:");
m_thickness_actions.set_exclusive(true); thickness_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
auto insert_action = [&](int size, bool checked = false) { thickness_label.set_fixed_size(80, 20);
auto action = GUI::Action::create_checkable(String::number(size), [this, size](auto&) {
m_thickness = size; auto& thickness_slider = thickness_container.add<GUI::HorizontalSlider>();
}); thickness_slider.set_fixed_height(20);
action->set_checked(checked); thickness_slider.set_range(1, 10);
m_thickness_actions.add_action(*action); thickness_slider.set_value(m_thickness);
m_context_menu->add_action(move(action)); thickness_slider.on_change = [&](int value) {
m_thickness = value;
}; };
insert_action(1, true);
insert_action(2); auto& mode_container = m_properties_widget->add<GUI::Widget>();
insert_action(3); mode_container.set_fixed_height(46);
insert_action(4); mode_container.set_layout<GUI::HorizontalBoxLayout>();
auto& mode_label = mode_container.add<GUI::Label>("Mode:");
mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label.set_fixed_size(80, 20);
auto& mode_radio_container = mode_container.add<GUI::Widget>();
mode_radio_container.set_layout<GUI::VerticalBoxLayout>();
auto& outline_mode_radio = mode_radio_container.add<GUI::RadioButton>("Outline");
auto& fill_mode_radio = mode_radio_container.add<GUI::RadioButton>("Fill");
outline_mode_radio.on_checked = [&](bool) {
m_mode = Mode::Outline;
};
fill_mode_radio.on_checked = [&](bool) {
m_mode = Mode::Fill;
};
outline_mode_radio.set_checked(true);
} }
m_context_menu->popup(event.screen_position());
return m_properties_widget.ptr();
} }
} }

5
Userland/Applications/PixelPaint/EllipseTool.h
View file

@ -20,9 +20,9 @@ public:
virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override; virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override; virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
virtual void on_mouseup(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override; virtual void on_mouseup(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
virtual void on_tool_button_contextmenu(GUI::ContextMenuEvent&) override;
virtual void on_second_paint(Layer const&, GUI::PaintEvent&) override; virtual void on_second_paint(Layer const&, GUI::PaintEvent&) override;
virtual void on_keydown(GUI::KeyEvent&) override; virtual void on_keydown(GUI::KeyEvent&) override;
virtual GUI::Widget* get_properties_widget() override;
private: private:
enum class Mode { enum class Mode {
@ -32,12 +32,11 @@ private:
void draw_using(GUI::Painter&, Gfx::IntRect const&); void draw_using(GUI::Painter&, Gfx::IntRect const&);
RefPtr<GUI::Widget> m_properties_widget;
GUI::MouseButton m_drawing_button { GUI::MouseButton::None }; GUI::MouseButton m_drawing_button { GUI::MouseButton::None };
Gfx::IntPoint m_ellipse_start_position; Gfx::IntPoint m_ellipse_start_position;
Gfx::IntPoint m_ellipse_end_position; Gfx::IntPoint m_ellipse_end_position;
RefPtr<GUI::Menu> m_context_menu;
int m_thickness { 1 }; int m_thickness { 1 };
GUI::ActionGroup m_thickness_actions;
Mode m_mode { Mode::Outline }; Mode m_mode { Mode::Outline };
}; };