jess
/
Graphite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Freehand tool extending after transforming the path (#1623) 

Fix extending after transforming
This commit is contained in:
zhiyuan 2024-03-01 11:50:02 +08:00 committed by GitHub
parent 70dce1c230
commit 5cf0b8893a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
editor/src/messages/tool/tool_messages/freehand_tool.rs
View File

@ -216,17 +216,13 @@ impl Fsm for FreehandToolFsmState {
(FreehandToolFsmState::Ready, FreehandToolMessage::DragStart) => {
responses.add(DocumentMessage::StartTransaction);
let parent = document.new_layer_parent();
let transform = document.metadata().transform_to_viewport(parent);
let pos = transform.inverse().transform_point2(input.mouse.position);
tool_data.dragged = false;
tool_data.extend_from_start = false;
tool_data.last_point = pos;
tool_data.weight = tool_options.line_weight;
if let Some((layer, subpath_index, from_start)) = should_extend(document, input.mouse.position, crate::consts::SNAP_POINT_TOLERANCE) {
let transform = document.metadata().transform_to_viewport(layer);
let pos = transform.inverse().transform_point2(input.mouse.position);
let manipulator_group = ManipulatorGroup::new_anchor(pos);
let modification = if from_start {
tool_data.extend_from_start = true;
@ -234,15 +230,23 @@ impl Fsm for FreehandToolFsmState {
} else {
VectorDataModification::AddEndManipulatorGroup { subpath_index, manipulator_group }
};
responses.add(GraphOperationMessage::Vector { layer, modification });
tool_data.dragged = true;
tool_data.last_point = pos;
tool_data.layer = Some(layer);
responses.add(GraphOperationMessage::Vector { layer, modification });
} else {
responses.add(DocumentMessage::DeselectAllLayers);
let parent = document.new_layer_parent();
let transform = document.metadata().transform_to_viewport(parent);
let pos = transform.inverse().transform_point2(input.mouse.position);
let subpath = bezier_rs::Subpath::from_anchors([pos], false);
let layer = graph_modification_utils::new_vector_layer(vec![subpath], NodeId(generate_uuid()), parent, responses);
tool_data.last_point = pos;
tool_data.layer = Some(layer);
responses.add(GraphOperationMessage::FillSet {