1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 03:58:12 +00:00

PixelPaint: Tool properties panel

Each tool can have its own set of properties that can be modified
through a panel on the right side.

The tools I've added properties for are:

Pen:
	Thickness

Brush:
	Size
	Hardness

Spray:
	Thickness
	Density

Bucket:
	Threshold
This commit is contained in:
BenJilks 2020-10-15 17:57:07 +00:00 committed by Andreas Kling
parent 544f2f3c96
commit afd52e2576
13 changed files with 324 additions and 12 deletions

View file

@ -29,8 +29,11 @@
#include "Layer.h"
#include <AK/Queue.h>
#include <LibGUI/Action.h>
#include <LibGUI/BoxLayout.h>
#include <LibGUI/Label.h>
#include <LibGUI/Menu.h>
#include <LibGUI/Painter.h>
#include <LibGUI/Slider.h>
#include <LibGfx/Bitmap.h>
#include <math.h>
#include <stdio.h>
@ -65,9 +68,9 @@ void SprayTool::paint_it()
GUI::Painter painter(bitmap);
ASSERT(bitmap.bpp() == 32);
m_editor->update();
const double minimal_radius = 10;
const double minimal_radius = 2;
const double base_radius = minimal_radius * m_thickness;
for (int i = 0; i < 100 + (nrand() * 800); i++) {
for (int i = 0; i < M_PI * base_radius * base_radius * (m_density / 100.0f); i++) {
double radius = base_radius * nrand();
double angle = 2 * M_PI * nrand();
const int xpos = m_last_pos.x() + radius * cos(angle);
@ -125,4 +128,52 @@ void SprayTool::on_tool_button_contextmenu(GUI::ContextMenuEvent& event)
m_context_menu->popup(event.screen_position());
}
GUI::Widget* SprayTool::get_properties_widget()
{
if (!m_properties_widget) {
m_properties_widget = GUI::Widget::construct();
m_properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto& thickness_container = m_properties_widget->add<GUI::Widget>();
thickness_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
thickness_container.set_preferred_size(0, 20);
thickness_container.set_layout<GUI::HorizontalBoxLayout>();
auto& thickness_label = thickness_container.add<GUI::Label>("Thickness:");
thickness_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
thickness_label.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed);
thickness_label.set_preferred_size(80, 20);
auto& thickness_slider = thickness_container.add<GUI::HorizontalSlider>();
thickness_slider.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
thickness_slider.set_preferred_size(0, 20);
thickness_slider.set_range(1, 20);
thickness_slider.set_value(m_thickness);
thickness_slider.on_value_changed = [this](int value) {
m_thickness = value;
};
auto& density_container = m_properties_widget->add<GUI::Widget>();
density_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
density_container.set_preferred_size(0, 20);
density_container.set_layout<GUI::HorizontalBoxLayout>();
auto& density_label = density_container.add<GUI::Label>("Density:");
density_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
density_label.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed);
density_label.set_preferred_size(80, 20);
auto& density_slider = density_container.add<GUI::HorizontalSlider>();
density_slider.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
density_slider.set_preferred_size(0, 30);
density_slider.set_range(1, 100);
density_slider.set_value(m_density);
density_slider.on_value_changed = [this](int value) {
m_density = value;
};
}
return m_properties_widget.ptr();
}
}