mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 20:17:44 +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:
parent
635130ef76
commit
0224dc2882
28 changed files with 186 additions and 127 deletions
|
@ -199,7 +199,8 @@ void ImageEditor::mousedown_event(GUI::MouseEvent& event)
|
|||
|
||||
auto layer_event = event_adjusted_for_layer(event, *m_active_layer);
|
||||
auto image_event = event_with_pan_and_scale_applied(event);
|
||||
m_active_tool->on_mousedown(*m_active_layer, layer_event, image_event);
|
||||
Tool::MouseEvent tool_event(Tool::MouseEvent::Action::MouseDown, layer_event, image_event, event);
|
||||
m_active_tool->on_mousedown(*m_active_layer, tool_event);
|
||||
}
|
||||
|
||||
void ImageEditor::mousemove_event(GUI::MouseEvent& event)
|
||||
|
@ -216,10 +217,11 @@ void ImageEditor::mousemove_event(GUI::MouseEvent& event)
|
|||
|
||||
if (!m_active_layer || !m_active_tool)
|
||||
return;
|
||||
|
||||
auto layer_event = event_adjusted_for_layer(event, *m_active_layer);
|
||||
auto image_event = event_with_pan_and_scale_applied(event);
|
||||
|
||||
m_active_tool->on_mousemove(*m_active_layer, layer_event, image_event);
|
||||
Tool::MouseEvent tool_event(Tool::MouseEvent::Action::MouseDown, layer_event, image_event, event);
|
||||
m_active_tool->on_mousemove(*m_active_layer, tool_event);
|
||||
|
||||
if (on_image_mouse_position_change) {
|
||||
on_image_mouse_position_change(image_event.position());
|
||||
|
@ -234,7 +236,8 @@ void ImageEditor::mouseup_event(GUI::MouseEvent& event)
|
|||
return;
|
||||
auto layer_event = event_adjusted_for_layer(event, *m_active_layer);
|
||||
auto image_event = event_with_pan_and_scale_applied(event);
|
||||
m_active_tool->on_mouseup(*m_active_layer, layer_event, image_event);
|
||||
Tool::MouseEvent tool_event(Tool::MouseEvent::Action::MouseDown, layer_event, image_event, event);
|
||||
m_active_tool->on_mouseup(*m_active_layer, tool_event);
|
||||
}
|
||||
|
||||
void ImageEditor::mousewheel_event(GUI::MouseEvent& event)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue