From faaf163e5c94034be388bad5be2cba84115720e0 Mon Sep 17 00:00:00 2001 From: 0SlowPoke0 Date: Fri, 12 Sep 2025 03:40:51 +0530 Subject: [PATCH 1/2] Fix: cancel active G/R/S transform when switching from Pen or Shape tool --- editor/src/messages/tool/tool_message_handler.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/editor/src/messages/tool/tool_message_handler.rs b/editor/src/messages/tool/tool_message_handler.rs index c3dc278463..bd56c5a397 100644 --- a/editor/src/messages/tool/tool_message_handler.rs +++ b/editor/src/messages/tool/tool_message_handler.rs @@ -139,7 +139,10 @@ impl MessageHandler> for ToolMessageHandler } } - if matches!(old_tool, ToolType::Path | ToolType::Select) { + // If a G/R/S transform is active while using Path, Select, Pen, or Shape, + // and the user switches to a different tool, cancel the current transform + // operation to avoid leaving it in an inconsistent stat + if matches!(old_tool, ToolType::Path | ToolType::Select | ToolType::Pen | ToolType::Shape) { responses.add(TransformLayerMessage::CancelTransformOperation); } }; From 6ccb79343ef0c602afcd9987e46dc18d6df31a77 Mon Sep 17 00:00:00 2001 From: Keavon Chambers Date: Thu, 11 Sep 2025 15:45:22 -0700 Subject: [PATCH 2/2] Fix typo --- editor/src/messages/tool/tool_message_handler.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editor/src/messages/tool/tool_message_handler.rs b/editor/src/messages/tool/tool_message_handler.rs index bd56c5a397..3e4a720006 100644 --- a/editor/src/messages/tool/tool_message_handler.rs +++ b/editor/src/messages/tool/tool_message_handler.rs @@ -141,7 +141,7 @@ impl MessageHandler> for ToolMessageHandler // If a G/R/S transform is active while using Path, Select, Pen, or Shape, // and the user switches to a different tool, cancel the current transform - // operation to avoid leaving it in an inconsistent stat + // operation to avoid leaving it in an inconsistent state if matches!(old_tool, ToolType::Path | ToolType::Select | ToolType::Pen | ToolType::Shape) { responses.add(TransformLayerMessage::CancelTransformOperation); }