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

PixelPaint: Add antialiased ellipse option

Browse source 
Currently this option is only supported for filled ellipses as that
is all the AntiAliasingPainter supports.
This commit is contained in:
MacDue 2022-04-27 20:50:18 +01:00 • committed by Linus Groh
parent 60aba4c9f3
commit 89445b967d
2 changed files with 28 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Userland/Applications/PixelPaint/Tools/EllipseTool.cpp
View file

@ -11,14 +11,15 @@
#include "../Layer.h" #include "../Layer.h"
#include <LibGUI/Action.h> #include <LibGUI/Action.h>
#include <LibGUI/BoxLayout.h> #include <LibGUI/BoxLayout.h>
#include <LibGUI/CheckBox.h>
#include <LibGUI/Label.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/RadioButton.h>
#include <LibGUI/TextBox.h> #include <LibGUI/TextBox.h>
#include <LibGUI/ValueSlider.h> #include <LibGUI/ValueSlider.h>
#include <LibGfx/Rect.h>
#include <LibGfx/AntiAliasingPainter.h> #include <LibGfx/AntiAliasingPainter.h>
#include <LibGfx/Rect.h>
namespace PixelPaint { namespace PixelPaint {
@ -36,7 +37,10 @@ void EllipseTool::draw_using(GUI::Painter& painter, Gfx::IntPoint const& start_p
case FillMode::Outline: case FillMode::Outline:
painter.draw_ellipse_intersecting(ellipse_intersecting_rect, m_editor->color_for(m_drawing_button), thickness); painter.draw_ellipse_intersecting(ellipse_intersecting_rect, m_editor->color_for(m_drawing_button), thickness);
break; break;
case FillMode::Fill: { case FillMode::Fill:
painter.fill_ellipse(ellipse_intersecting_rect, m_editor->color_for(m_drawing_button));
break;
case FillMode::FillAntiAliased: {
Gfx::AntiAliasingPainter aa_painter { painter }; Gfx::AntiAliasingPainter aa_painter { painter };
aa_painter.draw_ellipse(ellipse_intersecting_rect, m_editor->color_for(m_drawing_button)); aa_painter.draw_ellipse(ellipse_intersecting_rect, m_editor->color_for(m_drawing_button));
break; break;
@ -142,24 +146,38 @@ GUI::Widget* EllipseTool::get_properties_widget()
set_primary_slider(&thickness_slider); set_primary_slider(&thickness_slider);
auto& mode_container = m_properties_widget->add<GUI::Widget>(); auto& mode_container = m_properties_widget->add<GUI::Widget>();
mode_container.set_fixed_height(46); mode_container.set_fixed_height(70);
mode_container.set_layout<GUI::HorizontalBoxLayout>(); mode_container.set_layout<GUI::HorizontalBoxLayout>();
auto& mode_label = mode_container.add<GUI::Label>("Mode:"); auto& mode_label = mode_container.add<GUI::Label>("Mode:");
mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label.set_fixed_size(80, 20);
auto& mode_radio_container = mode_container.add<GUI::Widget>(); auto& mode_radio_container = mode_container.add<GUI::Widget>();
mode_radio_container.set_layout<GUI::VerticalBoxLayout>(); mode_radio_container.set_layout<GUI::VerticalBoxLayout>();
auto& outline_mode_radio = mode_radio_container.add<GUI::RadioButton>("Outline"); auto& outline_mode_radio = mode_radio_container.add<GUI::RadioButton>("Outline");
auto& fill_mode_radio = mode_radio_container.add<GUI::RadioButton>("Fill"); auto& fill_mode_radio = mode_radio_container.add<GUI::RadioButton>("Fill");
auto& aa_enable_checkbox = mode_radio_container.add<GUI::CheckBox>("Anti-alias");
outline_mode_radio.on_checked = [&](bool) { aa_enable_checkbox.on_checked = [&](bool checked) {
if (fill_mode_radio.is_checked())
m_fill_mode = checked ? FillMode::FillAntiAliased : FillMode::Fill;
};
outline_mode_radio.on_checked = [&](bool checked) {
if (checked) {
m_fill_mode = FillMode::Outline; m_fill_mode = FillMode::Outline;
aa_enable_checkbox.set_enabled(false);
m_last_aa_checkbox_state = aa_enable_checkbox.is_checked();
aa_enable_checkbox.set_checked(false);
}
}; };
fill_mode_radio.on_checked = [&](bool) { fill_mode_radio.on_checked = [&](bool checked) {
if (checked) {
m_fill_mode = FillMode::Fill; m_fill_mode = FillMode::Fill;
aa_enable_checkbox.set_checked(m_last_aa_checkbox_state);
aa_enable_checkbox.set_enabled(true);
}
}; };
aa_enable_checkbox.set_checked(false);
outline_mode_radio.set_checked(true); outline_mode_radio.set_checked(true);
auto& aspect_container = m_properties_widget->add<GUI::Widget>(); auto& aspect_container = m_properties_widget->add<GUI::Widget>();

2
Userland/Applications/PixelPaint/Tools/EllipseTool.h
View file

@ -32,6 +32,7 @@ private:
enum class FillMode { enum class FillMode {
Outline, Outline,
Fill, Fill,
FillAntiAliased
}; };
enum class DrawMode { enum class DrawMode {
@ -50,6 +51,7 @@ private:
Gfx::IntPoint m_ellipse_end_position; Gfx::IntPoint m_ellipse_end_position;
int m_thickness { 1 }; int m_thickness { 1 };
FillMode m_fill_mode { FillMode::Outline }; FillMode m_fill_mode { FillMode::Outline };
bool m_last_aa_checkbox_state { false };
DrawMode m_draw_mode { DrawMode::FromCorner }; DrawMode m_draw_mode { DrawMode::FromCorner };
Optional<float> m_aspect_ratio; Optional<float> m_aspect_ratio;
}; };