Multiply by document_to_viewport.matrix2.y_axis.length()

Author: 0HyperCube

editor/src/messages/portfolio/document/utility_types/transformation.rs

@@ -156,7 +156,8 @@ pub struct Translation {
 }
 
 impl Translation {
-	pub fn to_dvec(self, state: &TransformationState) -> DVec2 {
+	pub fn to_dvec(self, state: &TransformationState, document: &DocumentMessageHandler) -> DVec2 {
+		let document_to_viewport = document.metadata().document_to_viewport;
 		let displacement = if let Some(value) = self.typed_distance {
 			match self.constraint {
 				Axis::X => DVec2::X * value,
@@ -170,6 +171,7 @@ impl Translation {
 				Axis::Y => DVec2::Y * self.dragged_distance.dot(state.constraint_axis(self.constraint).unwrap_or_default()),
 			}
 		};
+		let displacement = displacement * document_to_viewport.matrix2.y_axis.length(); // Values are local to the viewport but scaled so values are relative to the current scale.
 		if state.is_rounded_to_intervals { displacement.round() } else { displacement }
 	}
 
@@ -329,7 +331,7 @@ impl TransformOperation {
 	pub fn apply_transform_operation(&self, selected: &mut Selected, state: &TransformationState, document: &DocumentMessageHandler) {
 		if self != &TransformOperation::None {
 			let mut transformation = match self {
-				TransformOperation::Grabbing(translation) => DAffine2::from_translation(translation.to_dvec(state)),
+				TransformOperation::Grabbing(translation) => DAffine2::from_translation(translation.to_dvec(state, document)),
 				TransformOperation::Rotating(rotation) => DAffine2::from_angle(rotation.to_f64(state.is_rounded_to_intervals)),
 				TransformOperation::Scaling(scale) => DAffine2::from_scale(scale.to_dvec(state.is_rounded_to_intervals)),
 				TransformOperation::None => unreachable!(),

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

@@ -231,8 +231,7 @@ impl MessageHandler<TransformLayerMessage, TransformLayerMessageContext<'_>> for
 				match self.transform_operation {
 					TransformOperation::None => (),
 					TransformOperation::Grabbing(translation) => {
-						let translation_local = translation.to_dvec(&self.state);
-						let translation_viewport = (self.state.local_to_viewport_transform() * document_to_viewport).transform_vector2(translation_local);
+						let translation_viewport = self.state.local_to_viewport_transform().matrix2 * translation.to_dvec(&self.state, document);
 						let pivot = document_to_viewport.transform_point2(self.grab_target);
 						let quad = Quad::from_box([pivot, pivot + translation_viewport]);
 
@@ -242,7 +241,7 @@ impl MessageHandler<TransformLayerMessage, TransformLayerMessageContext<'_>> for
 						});
 
 						let typed_string = (!self.typing.digits.is_empty() && self.transform_operation.can_begin_typing()).then(|| self.typing.string.clone());
-						overlay_context.translation_box(document_to_viewport.inverse().transform_vector2(translation_viewport), quad, typed_string);
+						overlay_context.translation_box(translation_viewport, quad, typed_string);
 					}
 					TransformOperation::Scaling(scale) => {
 						let scale = scale.to_f64(self.state.is_rounded_to_intervals);
@@ -537,8 +536,9 @@ impl MessageHandler<TransformLayerMessage, TransformLayerMessageContext<'_>> for
 						TransformOperation::Grabbing(translation) => {
 							let delta_pos = input.mouse.position - self.mouse_position;
 							let delta_pos = (self.initial_transform * document_to_viewport.inverse()).transform_vector2(delta_pos);
-							let change = if self.slow { delta_pos / SLOWING_DIVISOR } else { delta_pos };
-							self.transform_operation = TransformOperation::Grabbing(translation.increment_amount(change));
+							let delta_viewport = if self.slow { delta_pos / SLOWING_DIVISOR } else { delta_pos };
+							let delta_scaled = delta_viewport / document_to_viewport.y_axis.length(); // Values are local to the viewport but scaled so values are relative to the current scale.
+							self.transform_operation = TransformOperation::Grabbing(translation.increment_amount(delta_scaled));
 							self.transform_operation.apply_transform_operation(&mut selected, &self.state, document);
 						}
 						TransformOperation::Rotating(rotation) => {