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

PixelPaint: Add ability to draw ellipse from center

Browse source 
Like other common image editing applications, now if you press
`alt` while drawing an ellipse, it uses the starting position as
the center of the ellipse as opposed to one of the corners of the
bounding rect.

The EllipseTool class now keeps track of a `DrawMode`, which is
either `DrawMode::FromCorner` (default), or `DrawMode::FromCenter`
(the option added by this commit).

The `draw_using()` function was modified to now take in the start
and end positions and construct the `ellipse_intersecting_rect`
itself, since we need to construct it differently based on the
drawing mode.
This commit is contained in:
Mustafa Quraish 2021-08-26 15:54:00 -04:00 • committed by Andreas Kling
parent d04c8d478f
commit 1a3481f35b
2 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org> * Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2021, Mustafa Quraish <mustafa@cs.toronto.edu>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -26,8 +27,16 @@ EllipseTool::~EllipseTool()
{ {
} }
void EllipseTool::draw_using(GUI::Painter& painter, Gfx::IntRect const& ellipse_intersecting_rect) void EllipseTool::draw_using(GUI::Painter& painter, Gfx::IntPoint const& start_position, Gfx::IntPoint const& end_position)
{ {
Gfx::IntRect ellipse_intersecting_rect;
if (m_draw_mode == DrawMode::FromCenter) {
auto delta = end_position - start_position;
ellipse_intersecting_rect = Gfx::IntRect::from_two_points(start_position - delta, end_position);
} else {
ellipse_intersecting_rect = Gfx::IntRect::from_two_points(start_position, end_position);
}
switch (m_mode) { switch (m_mode) {
case Mode::Outline: case Mode::Outline:
painter.draw_ellipse_intersecting(ellipse_intersecting_rect, m_editor->color_for(m_drawing_button), m_thickness); painter.draw_ellipse_intersecting(ellipse_intersecting_rect, m_editor->color_for(m_drawing_button), m_thickness);
@ -65,7 +74,7 @@ void EllipseTool::on_mouseup(Layer* layer, MouseEvent& event)
if (event.layer_event().button() == m_drawing_button) { if (event.layer_event().button() == m_drawing_button) {
GUI::Painter painter(layer->bitmap()); GUI::Painter painter(layer->bitmap());
draw_using(painter, Gfx::IntRect::from_two_points(m_ellipse_start_position, m_ellipse_end_position)); draw_using(painter, m_ellipse_start_position, m_ellipse_end_position);
m_drawing_button = GUI::MouseButton::None; m_drawing_button = GUI::MouseButton::None;
m_editor->update(); m_editor->update();
m_editor->did_complete_action(); m_editor->did_complete_action();
@ -77,6 +86,8 @@ void EllipseTool::on_mousemove(Layer*, MouseEvent& event)
if (m_drawing_button == GUI::MouseButton::None) if (m_drawing_button == GUI::MouseButton::None)
return; return;
m_draw_mode = event.layer_event().alt() ? DrawMode::FromCenter : DrawMode::FromCorner;
m_ellipse_end_position = event.layer_event().position(); m_ellipse_end_position = event.layer_event().position();
m_editor->update(); m_editor->update();
} }
@ -90,7 +101,7 @@ void EllipseTool::on_second_paint(Layer const* layer, GUI::PaintEvent& event)
painter.add_clip_rect(event.rect()); painter.add_clip_rect(event.rect());
auto preview_start = m_editor->layer_position_to_editor_position(*layer, m_ellipse_start_position).to_type<int>(); auto preview_start = m_editor->layer_position_to_editor_position(*layer, m_ellipse_start_position).to_type<int>();
auto preview_end = m_editor->layer_position_to_editor_position(*layer, m_ellipse_end_position).to_type<int>(); auto preview_end = m_editor->layer_position_to_editor_position(*layer, m_ellipse_end_position).to_type<int>();
draw_using(painter, Gfx::IntRect::from_two_points(preview_start, preview_end)); draw_using(painter, preview_start, preview_end);
} }
void EllipseTool::on_keydown(GUI::KeyEvent& event) void EllipseTool::on_keydown(GUI::KeyEvent& event)

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

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org> * Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2021, Mustafa Quraish <mustafa@cs.toronto.edu>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -31,7 +32,12 @@ private:
Fill, Fill,
}; };
void draw_using(GUI::Painter&, Gfx::IntRect const&); enum class DrawMode {
FromCenter,
FromCorner,
};
void draw_using(GUI::Painter&, Gfx::IntPoint const& start_position, Gfx::IntPoint const& end_position);
RefPtr<GUI::Widget> m_properties_widget; RefPtr<GUI::Widget> m_properties_widget;
GUI::MouseButton m_drawing_button { GUI::MouseButton::None }; GUI::MouseButton m_drawing_button { GUI::MouseButton::None };
@ -39,6 +45,7 @@ private:
Gfx::IntPoint m_ellipse_end_position; Gfx::IntPoint m_ellipse_end_position;
int m_thickness { 1 }; int m_thickness { 1 };
Mode m_mode { Mode::Outline }; Mode m_mode { Mode::Outline };
DrawMode m_draw_mode { DrawMode::FromCorner };
}; };
} }