mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-09-20 17:58:18 +03:00
PixelPaint: Add ability to draw ellipse from center
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:
parent
d04c8d478f
commit
1a3481f35b
Notes:
sideshowbarker
2024-07-18 05:00:44 +09:00
Author: https://github.com/mustafaquraish Commit: https://github.com/SerenityOS/serenity/commit/1a3481f35bd Pull-request: https://github.com/SerenityOS/serenity/pull/9619 Reviewed-by: https://github.com/TobyAsE
@ -1,5 +1,6 @@
|
||||
/*
|
||||
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
|
||||
* Copyright (c) 2021, Mustafa Quraish <mustafa@cs.toronto.edu>
|
||||
*
|
||||
* 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) {
|
||||
case Mode::Outline:
|
||||
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) {
|
||||
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_editor->update();
|
||||
m_editor->did_complete_action();
|
||||
@ -77,6 +86,8 @@ void EllipseTool::on_mousemove(Layer*, MouseEvent& event)
|
||||
if (m_drawing_button == GUI::MouseButton::None)
|
||||
return;
|
||||
|
||||
m_draw_mode = event.layer_event().alt() ? DrawMode::FromCenter : DrawMode::FromCorner;
|
||||
|
||||
m_ellipse_end_position = event.layer_event().position();
|
||||
m_editor->update();
|
||||
}
|
||||
@ -90,7 +101,7 @@ void EllipseTool::on_second_paint(Layer const* layer, GUI::PaintEvent& event)
|
||||
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_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)
|
||||
|
@ -1,5 +1,6 @@
|
||||
/*
|
||||
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
|
||||
* Copyright (c) 2021, Mustafa Quraish <mustafa@cs.toronto.edu>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
@ -31,7 +32,12 @@ private:
|
||||
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;
|
||||
GUI::MouseButton m_drawing_button { GUI::MouseButton::None };
|
||||
@ -39,6 +45,7 @@ private:
|
||||
Gfx::IntPoint m_ellipse_end_position;
|
||||
int m_thickness { 1 };
|
||||
Mode m_mode { Mode::Outline };
|
||||
DrawMode m_draw_mode { DrawMode::FromCorner };
|
||||
};
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user