From 01c180d4783ff380cc3750c6a7105ea7903d1699 Mon Sep 17 00:00:00 2001 From: 0HyperCube <78500760+0HyperCube@users.noreply.github.com> Date: Sat, 27 Aug 2022 23:21:26 +0100 Subject: [PATCH] Prevent using G/R/S without any layers selected (#761) Stop users from using g/r/s without selected layers Co-authored-by: Keavon Chambers --- .../transform_layer_message_handler.rs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/editor/src/messages/portfolio/document/transform_layer/transform_layer_message_handler.rs b/editor/src/messages/portfolio/document/transform_layer/transform_layer_message_handler.rs index e135b385..7cf36cdc 100644 --- a/editor/src/messages/portfolio/document/transform_layer/transform_layer_message_handler.rs +++ b/editor/src/messages/portfolio/document/transform_layer/transform_layer_message_handler.rs @@ -61,6 +61,11 @@ impl<'a> MessageHandler> for TransformL return; } + // Don't allow grab with no selected layers + if selected_layers.len() == 0 { + return; + } + begin_operation(self.transform_operation, &mut self.typing, &mut self.mouse_position, &mut self.start_mouse); self.transform_operation = TransformOperation::Grabbing(Default::default()); @@ -72,6 +77,11 @@ impl<'a> MessageHandler> for TransformL return; } + // Don't allow rotate with no selected layers + if selected_layers.len() == 0 { + return; + } + begin_operation(self.transform_operation, &mut self.typing, &mut self.mouse_position, &mut self.start_mouse); self.transform_operation = TransformOperation::Rotating(Default::default()); @@ -83,6 +93,11 @@ impl<'a> MessageHandler> for TransformL return; } + // Don't allow scale with no selected layers + if selected_layers.len() == 0 { + return; + } + begin_operation(self.transform_operation, &mut self.typing, &mut self.mouse_position, &mut self.start_mouse); self.transform_operation = TransformOperation::Scaling(Default::default());