Skip to content

Commit 74e35f0

Browse files
authored
Fix regression with GRS cancellation being broken (#2877)
Fix for cancel regression in path tool
1 parent 88ac275 commit 74e35f0

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

editor/src/messages/tool/transform_layer/transform_layer_message_handler.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::consts::{ANGLE_MEASURE_RADIUS_FACTOR, ARC_MEASURE_RADIUS_FACTOR_RANGE, COLOR_OVERLAY_BLUE, COLOR_OVERLAY_GRAY_25, SLOWING_DIVISOR};
1+
use crate::consts::{ANGLE_MEASURE_RADIUS_FACTOR, ARC_MEASURE_RADIUS_FACTOR_RANGE, COLOR_OVERLAY_BLUE, COLOR_OVERLAY_GRAY, SLOWING_DIVISOR};
22
use crate::messages::input_mapper::utility_types::input_mouse::{DocumentPosition, ViewportPosition};
33
use crate::messages::portfolio::document::overlays::utility_types::{OverlayProvider, Pivot};
44
use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier;
@@ -177,7 +177,7 @@ impl MessageHandler<TransformLayerMessage, TransformLayerMessageContext<'_>> for
177177

178178
if using_path_tool {
179179
for (outline, transform) in &self.ghost_outline {
180-
overlay_context.outline(outline.iter(), *transform, Some(COLOR_OVERLAY_GRAY_25));
180+
overlay_context.outline(outline.iter(), *transform, Some(COLOR_OVERLAY_GRAY));
181181
}
182182
}
183183

@@ -407,6 +407,10 @@ impl MessageHandler<TransformLayerMessage, TransformLayerMessageContext<'_>> for
407407
TransformLayerMessage::BeginRotate => responses.add_front(TransformLayerMessage::BeginGRS { operation: TransformType::Rotate }),
408408
TransformLayerMessage::BeginScale => responses.add_front(TransformLayerMessage::BeginGRS { operation: TransformType::Scale }),
409409
TransformLayerMessage::CancelTransformOperation => {
410+
if using_path_tool {
411+
self.ghost_outline.clear();
412+
}
413+
410414
if using_pen_tool {
411415
self.typing.clear();
412416

@@ -416,8 +420,6 @@ impl MessageHandler<TransformLayerMessage, TransformLayerMessageContext<'_>> for
416420

417421
responses.add(PenToolMessage::Abort);
418422
responses.add(ToolMessage::UpdateHints);
419-
} else if using_path_tool {
420-
self.ghost_outline.clear();
421423
} else {
422424
selected.original_transforms.clear();
423425
self.typing.clear();

0 commit comments

Comments
 (0)