Merge branch 'master' into path-tool-update

GraphiteEditor · Jan 20, 2025 · 23fac61 · 23fac61
2 parents d472eb5 + ad68b1e
commit 23fac61
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/editor/src/messages/tool/tool_messages/pen_tool.rs b/editor/src/messages/tool/tool_messages/pen_tool.rs
@@ -332,9 +332,8 @@ impl PenToolData {
 				},
 			});
 		}
-		if close_subpath {
-			responses.add(DocumentMessage::EndTransaction);
-		} else {
+		responses.add(DocumentMessage::EndTransaction);
+		if !close_subpath {
 			self.add_point(LastPoint {
 				id: end,
 				pos: next_point,
@@ -764,7 +763,7 @@ impl Fsm for PenToolFsmState {
 
 				state
 			}
-			(PenToolFsmState::DraggingHandle | PenToolFsmState::PlacingAnchor, PenToolMessage::Abort | PenToolMessage::Confirm) => {
+			(PenToolFsmState::DraggingHandle | PenToolFsmState::PlacingAnchor, PenToolMessage::Confirm) => {
 				responses.add(DocumentMessage::EndTransaction);
 				tool_data.handle_end = None;
 				tool_data.latest_points.clear();
@@ -793,9 +792,8 @@ impl Fsm for PenToolFsmState {
 			}
 			(_, PenToolMessage::Redo) => {
 				tool_data.point_index = (tool_data.point_index + 1).min(tool_data.latest_points.len().saturating_sub(1));
-				tool_data
-					.place_anchor(SnapData::new(document, input), transform, input.mouse.position, responses)
-					.unwrap_or(PenToolFsmState::PlacingAnchor)
+				tool_data.place_anchor(SnapData::new(document, input), transform, input.mouse.position, responses);
+				(tool_data.point_index == 0).then_some(PenToolFsmState::Ready).unwrap_or(PenToolFsmState::PlacingAnchor)
 			}
 			_ => self,
 		}