1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 05:07:35 +00:00

PixelPaint: Pass raw mouse event to Tools and wrap them all in a struct

This commit adds a Tool::MouseEvent struct, which contains events that
may be needed by tools: layer-relative, image-relative and raw (editor-
relative) event.

The raw event is used by ZoomTool to properly pan the view. This fixes
a bug which caused image to snap out of sight.
This commit is contained in:
Maciej Zygmanowski 2021-08-25 10:06:00 +02:00 committed by Andreas Kling
parent 635130ef76
commit 0224dc2882
28 changed files with 186 additions and 127 deletions

View file

@ -24,43 +24,46 @@ PenTool::~PenTool()
{
}
void PenTool::on_mousedown(Layer& layer, GUI::MouseEvent& event, GUI::MouseEvent&)
void PenTool::on_mousedown(Layer& layer, MouseEvent& event)
{
if (event.button() != GUI::MouseButton::Left && event.button() != GUI::MouseButton::Right)
auto& layer_event = event.layer_event();
if (layer_event.button() != GUI::MouseButton::Left && layer_event.button() != GUI::MouseButton::Right)
return;
GUI::Painter painter(layer.bitmap());
painter.draw_line(event.position(), event.position(), m_editor->color_for(event), m_thickness);
layer.did_modify_bitmap(Gfx::IntRect::centered_on(event.position(), Gfx::IntSize { m_thickness + 2, m_thickness + 2 }));
m_last_drawing_event_position = event.position();
painter.draw_line(layer_event.position(), layer_event.position(), m_editor->color_for(layer_event), m_thickness);
layer.did_modify_bitmap(Gfx::IntRect::centered_on(layer_event.position(), Gfx::IntSize { m_thickness + 2, m_thickness + 2 }));
m_last_drawing_event_position = layer_event.position();
}
void PenTool::on_mouseup(Layer&, GUI::MouseEvent& event, GUI::MouseEvent&)
void PenTool::on_mouseup(Layer&, MouseEvent& event)
{
if (event.button() == GUI::MouseButton::Left || event.button() == GUI::MouseButton::Right) {
auto& layer_event = event.layer_event();
if (layer_event.button() == GUI::MouseButton::Left || layer_event.button() == GUI::MouseButton::Right) {
m_last_drawing_event_position = { -1, -1 };
m_editor->did_complete_action();
}
}
void PenTool::on_mousemove(Layer& layer, GUI::MouseEvent& event, GUI::MouseEvent&)
void PenTool::on_mousemove(Layer& layer, MouseEvent& event)
{
if (!(event.buttons() & GUI::MouseButton::Left || event.buttons() & GUI::MouseButton::Right))
auto& layer_event = event.layer_event();
if (!(layer_event.buttons() & GUI::MouseButton::Left || layer_event.buttons() & GUI::MouseButton::Right))
return;
GUI::Painter painter(layer.bitmap());
Gfx::IntRect changed_rect;
if (m_last_drawing_event_position != Gfx::IntPoint(-1, -1)) {
painter.draw_line(m_last_drawing_event_position, event.position(), m_editor->color_for(event), m_thickness);
changed_rect = Gfx::IntRect::from_two_points(m_last_drawing_event_position, event.position());
painter.draw_line(m_last_drawing_event_position, layer_event.position(), m_editor->color_for(layer_event), m_thickness);
changed_rect = Gfx::IntRect::from_two_points(m_last_drawing_event_position, layer_event.position());
} else {
painter.draw_line(event.position(), event.position(), m_editor->color_for(event), m_thickness);
changed_rect = Gfx::IntRect::from_two_points(event.position(), event.position());
painter.draw_line(layer_event.position(), layer_event.position(), m_editor->color_for(layer_event), m_thickness);
changed_rect = Gfx::IntRect::from_two_points(layer_event.position(), layer_event.position());
}
changed_rect.inflate(m_thickness + 2, m_thickness + 2);
layer.did_modify_bitmap(changed_rect);
m_last_drawing_event_position = event.position();
m_last_drawing_event_position = layer_event.position();
}
GUI::Widget* PenTool::get_properties_widget()