mirrors/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2025-08-15 10:40:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix the Path tool's point dragging getting offset when viewport is panned (#1693)

Browse source 
fix: moving a point with the path tool after panning

Co-authored-by: Nico Mayora <mayoranicolas0104@gmail.com>
This commit is contained in:
Nicolás Mayora 2024-03-18 03:30:53 -03:00 • committed by GitHub
parent 058aa7121c
commit ed3f7acdd7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
editor/src/messages/tool/tool_messages/path_tool.rs
View file

@ -345,7 +345,7 @@ impl PathToolData {
responses.add(NodeGraphMessage::SelectedNodesSet { nodes: vec![layer.to_node()] }); responses.add(NodeGraphMessage::SelectedNodesSet { nodes: vec![layer.to_node()] });
} }
self.drag_start_pos = input.mouse.position; self.drag_start_pos = input.mouse.position;
self.previous_mouse_position = input.mouse.position; self.previous_mouse_position = document.metadata.document_to_viewport.inverse().transform_point2(input.mouse.position);
shape_editor.select_all_anchors_in_layer(&document.network, layer); shape_editor.select_all_anchors_in_layer(&document.network, layer);
PathToolFsmState::Dragging PathToolFsmState::Dragging
@ -353,13 +353,13 @@ impl PathToolData {
// Start drawing a box // Start drawing a box
else { else {
self.drag_start_pos = input.mouse.position; self.drag_start_pos = input.mouse.position;
self.previous_mouse_position = input.mouse.position; self.previous_mouse_position = document.metadata.document_to_viewport.inverse().transform_point2(input.mouse.position);
PathToolFsmState::DrawingBox PathToolFsmState::DrawingBox
} }
} }
fn start_dragging_point(&mut self, mut selected_points: SelectedPointsInfo, input: &InputPreprocessorMessageHandler, _document: &DocumentMessageHandler, responses: &mut VecDeque<Message>) { fn start_dragging_point(&mut self, mut selected_points: SelectedPointsInfo, input: &InputPreprocessorMessageHandler, document: &DocumentMessageHandler, responses: &mut VecDeque<Message>) {
responses.add(DocumentMessage::StartTransaction); responses.add(DocumentMessage::StartTransaction);
// TODO: enable snapping // TODO: enable snapping
@ -384,8 +384,8 @@ impl PathToolData {
} }
selected_points.points.extend(additional_selected_points); selected_points.points.extend(additional_selected_points);
self.drag_start_pos = input.mouse.position; let viewport_to_document = document.metadata.document_to_viewport.inverse();
self.previous_mouse_position = input.mouse.position - selected_points.offset; self.previous_mouse_position = viewport_to_document.transform_point2(input.mouse.position - selected_points.offset);
} }
fn drag(&mut self, shift: bool, alt: bool, shape_editor: &mut ShapeState, document: &DocumentMessageHandler, input: &InputPreprocessorMessageHandler, responses: &mut VecDeque<Message>) { fn drag(&mut self, shift: bool, alt: bool, shape_editor: &mut ShapeState, document: &DocumentMessageHandler, input: &InputPreprocessorMessageHandler, responses: &mut VecDeque<Message>) {
@ -406,9 +406,10 @@ impl PathToolData {
} }
// Move the selected points with the mouse // Move the selected points with the mouse
let snapped_delta = shape_editor.snap(&mut self.snap_manager, document, input, self.previous_mouse_position); let previous_mouse = document.metadata.document_to_viewport.transform_point2(self.previous_mouse_position);
let snapped_delta = shape_editor.snap(&mut self.snap_manager, document, input, previous_mouse);
shape_editor.move_selected_points(&document.network, &document.metadata, snapped_delta, shift, responses); shape_editor.move_selected_points(&document.network, &document.metadata, snapped_delta, shift, responses);
self.previous_mouse_position += snapped_delta; self.previous_mouse_position += document.metadata.document_to_viewport.inverse().transform_vector2(snapped_delta);
} }
} }