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

PixelPaint: Make the EllipseTool previews work while zoomed in

Browse source
This commit is contained in:
Andreas Kling 2020-05-22 15:57:04 +02:00
parent d12cce76a7
commit 9fc4ad2a52
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Applications/PixelPaint/EllipseTool.cpp
View file

@ -43,9 +43,8 @@ EllipseTool::~EllipseTool()
{ {
} }
void EllipseTool::draw_using(GUI::Painter& painter) void EllipseTool::draw_using(GUI::Painter& painter, const Gfx::Rect& ellipse_intersecting_rect)
{ {
auto ellipse_intersecting_rect = Gfx::Rect::from_two_points(m_ellipse_start_position, m_ellipse_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);
@ -73,7 +72,7 @@ void EllipseTool::on_mouseup(Layer& layer, GUI::MouseEvent& event, GUI::MouseEve
{ {
if (event.button() == m_drawing_button) { if (event.button() == m_drawing_button) {
GUI::Painter painter(layer.bitmap()); GUI::Painter painter(layer.bitmap());
draw_using(painter); draw_using(painter, Gfx::Rect::from_two_points(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();
} }
@ -95,8 +94,9 @@ void EllipseTool::on_second_paint(const Layer& layer, GUI::PaintEvent& event)
GUI::Painter painter(*m_editor); GUI::Painter painter(*m_editor);
painter.add_clip_rect(event.rect()); painter.add_clip_rect(event.rect());
painter.translate(layer.location()); auto preview_start = m_editor->layer_position_to_editor_position(layer, m_ellipse_start_position).to_int_point();
draw_using(painter); auto preview_end = m_editor->layer_position_to_editor_position(layer, m_ellipse_end_position).to_int_point();
draw_using(painter, Gfx::Rect::from_two_points(preview_start, preview_end));
} }
void EllipseTool::on_keydown(GUI::KeyEvent& event) void EllipseTool::on_keydown(GUI::KeyEvent& event)

2
Applications/PixelPaint/EllipseTool.h
View file

@ -51,7 +51,7 @@ private:
}; };
virtual const char* class_name() const override { return "EllipseTool"; } virtual const char* class_name() const override { return "EllipseTool"; }
void draw_using(GUI::Painter& painter); void draw_using(GUI::Painter&, const Gfx::Rect&);
GUI::MouseButton m_drawing_button { GUI::MouseButton::None }; GUI::MouseButton m_drawing_button { GUI::MouseButton::None };
Gfx::Point m_ellipse_start_position; Gfx::Point m_ellipse_start_position;