RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-23 18:05:08 +00:00
Code Issues Activity Actions

PixelPaint: Make the RectangleTool previews work while zoomed in

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

16
Applications/PixelPaint/RectangleTool.cpp
View file

@ -43,18 +43,17 @@ RectangleTool::~RectangleTool()
{ {
} }
void RectangleTool::draw_using(GUI::Painter& painter) void RectangleTool::draw_using(GUI::Painter& painter, const Gfx::Rect& rect)
{ {
auto rect_to_draw = Gfx::Rect::from_two_points(m_rectangle_start_position, m_rectangle_end_position);
switch (m_mode) { switch (m_mode) {
case Mode::Fill: case Mode::Fill:
painter.fill_rect(rect_to_draw, m_editor->color_for(m_drawing_button)); painter.fill_rect(rect, m_editor->color_for(m_drawing_button));
break; break;
case Mode::Outline: case Mode::Outline:
painter.draw_rect(rect_to_draw, m_editor->color_for(m_drawing_button)); painter.draw_rect(rect, m_editor->color_for(m_drawing_button));
break; break;
case Mode::Gradient: case Mode::Gradient:
painter.fill_rect_with_gradient(rect_to_draw, m_editor->primary_color(), m_editor->secondary_color()); painter.fill_rect_with_gradient(rect, m_editor->primary_color(), m_editor->secondary_color());
break; break;
default: default:
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
@ -79,7 +78,8 @@ void RectangleTool::on_mouseup(Layer& layer, GUI::MouseEvent& event, GUI::MouseE
{ {
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); auto rect = Gfx::Rect::from_two_points(m_rectangle_start_position, m_rectangle_end_position);
draw_using(painter, rect);
m_drawing_button = GUI::MouseButton::None; m_drawing_button = GUI::MouseButton::None;
m_editor->update(); m_editor->update();
} }
@ -101,8 +101,8 @@ void RectangleTool::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 rect = Gfx::Rect::from_two_points(m_editor->layer_position_to_editor_position(layer, m_rectangle_start_position).to_int_point(), m_editor->layer_position_to_editor_position(layer, m_rectangle_end_position).to_int_point());
draw_using(painter); draw_using(painter, rect);
} }
void RectangleTool::on_keydown(GUI::KeyEvent& event) void RectangleTool::on_keydown(GUI::KeyEvent& event)

2
Applications/PixelPaint/RectangleTool.h
View file

@ -52,7 +52,7 @@ private:
}; };
virtual const char* class_name() const override { return "RectangleTool"; } virtual const char* class_name() const override { return "RectangleTool"; }
void draw_using(GUI::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_rectangle_start_position; Gfx::Point m_rectangle_start_position;