Shortcut

Author: jsjgdh

editor/src/messages/input_mapper/input_mapper_message_handler.rs

@@ -69,7 +69,15 @@ impl InputMapperMessageHandler {
 			// Append the key button for the entry
 			use InputMapperMessage as IMM;
 			match entry.input {
-				IMM::KeyDown(key) | IMM::KeyUp(key) | IMM::KeyDownNoRepeat(key) | IMM::KeyUpNoRepeat(key) | IMM::DoubleTap(key) => keys.push(key),
+				IMM::KeyDown(key) | IMM::KeyUp(key) | IMM::KeyDownNoRepeat(key) | IMM::KeyUpNoRepeat(key) => keys.push(key),
+				IMM::DoubleTap(key) => {
+					keys.push(Key::Double);
+					keys.push(key);
+				}
+				IMM::DoubleClick(button) => {
+					keys.push(Key::Double);
+					keys.push(button.into());
+				}
 				_ => (),
 			}
 

editor/src/messages/input_mapper/utility_types/input_keyboard.rs

@@ -240,6 +240,8 @@ pub enum Key {
 	FakeKeyPlus,
 	/// Not a physical key that can be pressed. May be used so that an actual shortcut bound to all ten number keys (0, ..., 9) can separately map this fake "key" as an additional binding to display the "0–9" shortcut label in the UI.
 	FakeKeyNumbers,
+	/// Not a physical key that can be pressed.
+	Double,
 
 	_KeysVariantCount, // This has to be the last element in the enum
 }
@@ -331,6 +333,7 @@ impl fmt::Display for Key {
 			// Fake keys for displaying special labels in the UI
 			Self::FakeKeyPlus => "+",
 			Self::FakeKeyNumbers => "0–9",
+			Self::Double => "2x",
 
 			_ => key_name.as_str(),
 		};

editor/src/messages/input_mapper/utility_types/input_mouse.rs

@@ -1,3 +1,4 @@
+use super::input_keyboard::Key;
 use crate::consts::DRAG_THRESHOLD;
 use crate::messages::prelude::*;
 use bitflags::bitflags;
@@ -121,4 +122,16 @@ pub enum MouseButton {
 	Forward,
 }
 
+impl From<MouseButton> for Key {
+	fn from(mouse_button: MouseButton) -> Self {
+		match mouse_button {
+			MouseButton::Left => Key::MouseLeft,
+			MouseButton::Right => Key::MouseRight,
+			MouseButton::Middle => Key::MouseMiddle,
+			MouseButton::Back => Key::MouseBack,
+			MouseButton::Forward => Key::MouseForward,
+		}
+	}
+}
+
 pub const NUMBER_OF_MOUSE_BUTTONS: usize = 5; // Should be the number of variants in MouseButton