From 4f871919f592d9c6126e41d7feffff874d2574db Mon Sep 17 00:00:00 2001
From: 0HyperCube <78500760+0HyperCube@users.noreply.github.com>
Date: Mon, 30 Aug 2021 11:07:43 +0100
Subject: [PATCH] Add space key & drag to pan the canvas (#364)

---
 editor/src/document/movement_handler.rs | 11 ++++++++---
 editor/src/input/input_mapper.rs        |  4 +++-
 editor/src/input/keyboard.rs            |  1 +
 frontend/wasm/src/wrappers.rs           |  1 +
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/editor/src/document/movement_handler.rs b/editor/src/document/movement_handler.rs
index 69bf4142..ca78cfb3 100644
--- a/editor/src/document/movement_handler.rs
+++ b/editor/src/document/movement_handler.rs
@@ -24,7 +24,7 @@ pub enum MovementMessage {
 	EnableSnapping,
 	DisableSnapping,
 	ZoomCanvasBegin,
-	TranslateCanvasEnd,
+	TransformCanvasEnd,
 	SetCanvasRotation(f64),
 	SetCanvasZoom(f64),
 	IncreaseCanvasZoom,
@@ -79,7 +79,7 @@ impl MessageHandler<MovementMessage, (&mut LayerData, &Document, &InputPreproces
 				self.zooming = true;
 				self.mouse_pos = ipp.mouse.position;
 			}
-			TranslateCanvasEnd => {
+			TransformCanvasEnd => {
 				layerdata.rotation = layerdata.snapped_angle();
 				layerdata.snap_rotate = false;
 				self.translating = false;
@@ -221,7 +221,6 @@ impl MessageHandler<MovementMessage, (&mut LayerData, &Document, &InputPreproces
 	fn actions(&self) -> ActionList {
 		let mut common = actions!(MovementMessageDiscriminant;
 			MouseMove,
-			TranslateCanvasEnd,
 			TranslateCanvasBegin,
 			RotateCanvasBegin,
 			ZoomCanvasBegin,
@@ -243,6 +242,12 @@ impl MessageHandler<MovementMessage, (&mut LayerData, &Document, &InputPreproces
 			);
 			common.extend(snapping);
 		}
+		if self.translating || self.rotating || self.zooming {
+			let transforming = actions!(MovementMessageDiscriminant;
+				TransformCanvasEnd,
+			);
+			common.extend(transforming);
+		}
 		common
 	}
 }
diff --git a/editor/src/input/input_mapper.rs b/editor/src/input/input_mapper.rs
index 3b7e6976..141d2de6 100644
--- a/editor/src/input/input_mapper.rs
+++ b/editor/src/input/input_mapper.rs
@@ -208,7 +208,9 @@ impl Default for Mapping {
 			entry! {action=MovementMessage::ZoomCanvasBegin, key_down=Mmb, modifiers=[KeyShift]},
 			entry! {action=MovementMessage::ZoomCanvasToFitAll, key_down=Key0, modifiers=[KeyControl]},
 			entry! {action=MovementMessage::TranslateCanvasBegin, key_down=Mmb},
-			entry! {action=MovementMessage::TranslateCanvasEnd, key_up=Mmb},
+			entry! {action=MovementMessage::TransformCanvasEnd, key_up=Mmb},
+			entry! {action=MovementMessage::TranslateCanvasBegin, key_down=Lmb, modifiers=[KeySpace]},
+			entry! {action=MovementMessage::TransformCanvasEnd, key_up=Lmb, modifiers=[KeySpace]},
 			entry! {action=MovementMessage::IncreaseCanvasZoom, key_down=KeyPlus, modifiers=[KeyControl]},
 			entry! {action=MovementMessage::IncreaseCanvasZoom, key_down=KeyEquals, modifiers=[KeyControl]},
 			entry! {action=MovementMessage::DecreaseCanvasZoom, key_down=KeyMinus, modifiers=[KeyControl]},
diff --git a/editor/src/input/keyboard.rs b/editor/src/input/keyboard.rs
index 704bbf79..9db87fb3 100644
--- a/editor/src/input/keyboard.rs
+++ b/editor/src/input/keyboard.rs
@@ -63,6 +63,7 @@ pub enum Key {
 	KeyMinus,
 	KeyPlus,
 	KeyShift,
+	KeySpace,
 	KeyControl,
 	KeyDelete,
 	KeyBackspace,
diff --git a/frontend/wasm/src/wrappers.rs b/frontend/wasm/src/wrappers.rs
index b534cd7c..febc8000 100644
--- a/frontend/wasm/src/wrappers.rs
+++ b/frontend/wasm/src/wrappers.rs
@@ -137,6 +137,7 @@ pub fn translate_key(name: &str) -> Key {
 		"shift" => KeyShift,
 		// When using linux + chrome + the neo keyboard layout, the shift key is recognized as caps
 		"capslock" => KeyShift,
+		" " => KeySpace,
 		"control" => KeyControl,
 		"delete" => KeyDelete,
 		"backspace" => KeyBackspace,