Fix

Author: jsjgdh

editor/src/messages/input_preprocessor/input_preprocessor_message_handler.rs

@@ -18,7 +18,7 @@ pub struct InputPreprocessorMessageHandler {
 	pub keyboard: KeyStates,
 	pub mouse: MouseState,
 	pub last_key_down: Option<(Key, u64)>, // (Key, timestamp)
-	pub double_tap_key: Option<Key>,
+	pub double_tap_key: Option<(Key, u64)>,
 }
 
 #[message_handler_data]
@@ -28,6 +28,7 @@ impl<'a> MessageHandler<InputPreprocessorMessage, InputPreprocessorMessageContex
 
 		match message {
 			InputPreprocessorMessage::DoubleClick { editor_mouse_state, modifier_keys } => {
+				self.clear_double_tap_state();
 				self.update_states_of_modifier_keys(modifier_keys, responses);
 
 				let mouse_state = editor_mouse_state.to_mouse_state(viewport);
@@ -54,10 +55,11 @@ impl<'a> MessageHandler<InputPreprocessorMessage, InputPreprocessorMessageContex
 						.is_some_and(|(last_key, last_time)| last_key == key && self.time.saturating_sub(last_time) < DOUBLE_CLICK_MILLISECONDS);
 
 					if is_double_tap {
-						self.double_tap_key = Some(key);
+						self.double_tap_key = Some((key, self.time));
 						self.last_key_down = None;
 					} else {
 						self.last_key_down = Some((key, self.time));
+						self.double_tap_key = None;
 					}
 
 					responses.add(InputMapperMessage::KeyDownNoRepeat(key));
@@ -70,13 +72,16 @@ impl<'a> MessageHandler<InputPreprocessorMessage, InputPreprocessorMessageContex
 				if !key_repeat {
 					responses.add(InputMapperMessage::KeyUpNoRepeat(key));
 				}
-				if self.double_tap_key == Some(key) {
-					responses.add(InputMapperMessage::DoubleTap(key));
+				if let Some((dt_key, dt_time)) = self.double_tap_key {
+					if dt_key == key && self.time.saturating_sub(dt_time) < DOUBLE_CLICK_MILLISECONDS {
+						responses.add(InputMapperMessage::DoubleTap(key));
+					}
 					self.double_tap_key = None;
 				}
 				responses.add(InputMapperMessage::KeyUp(key));
 			}
 			InputPreprocessorMessage::PointerDown { editor_mouse_state, modifier_keys } => {
+				self.clear_double_tap_state();
 				self.update_states_of_modifier_keys(modifier_keys, responses);
 
 				let mouse_state = editor_mouse_state.to_mouse_state(viewport);
@@ -96,6 +101,7 @@ impl<'a> MessageHandler<InputPreprocessorMessage, InputPreprocessorMessageContex
 				self.translate_mouse_event(mouse_state, false, responses);
 			}
 			InputPreprocessorMessage::PointerUp { editor_mouse_state, modifier_keys } => {
+				self.clear_double_tap_state();
 				self.update_states_of_modifier_keys(modifier_keys, responses);
 
 				let mouse_state = editor_mouse_state.to_mouse_state(viewport);
@@ -117,6 +123,7 @@ impl<'a> MessageHandler<InputPreprocessorMessage, InputPreprocessorMessageContex
 				self.frame_time.advance_timestamp(Duration::from_millis(timestamp));
 			}
 			InputPreprocessorMessage::WheelScroll { editor_mouse_state, modifier_keys } => {
+				self.clear_double_tap_state();
 				self.update_states_of_modifier_keys(modifier_keys, responses);
 
 				let mouse_state = editor_mouse_state.to_mouse_state(viewport);
@@ -135,6 +142,11 @@ impl<'a> MessageHandler<InputPreprocessorMessage, InputPreprocessorMessageContex
 }
 
 impl InputPreprocessorMessageHandler {
+	fn clear_double_tap_state(&mut self) {
+		self.last_key_down = None;
+		self.double_tap_key = None;
+	}
+
 	fn translate_mouse_event(&mut self, mut new_state: MouseState, allow_first_button_down: bool, responses: &mut VecDeque<Message>) {
 		let click_mappings = [
 			(MouseKeys::LEFT, Key::MouseLeft),
@@ -359,7 +371,7 @@ mod test {
 		assert!(responses.contains(&InputMapperMessage::KeyDown(Key::Space).into()));
 		assert!(responses.contains(&InputMapperMessage::KeyDownNoRepeat(Key::Space).into()));
 		assert!(input_preprocessor.last_key_down.is_none());
-		assert_eq!(input_preprocessor.double_tap_key, Some(Key::Space));
+		assert_eq!(input_preprocessor.double_tap_key, Some((Key::Space, 50)));
 
 		responses.clear();
 		key_up(&mut input_preprocessor, Key::Space, &mut responses);
@@ -394,4 +406,55 @@ mod test {
 
 		assert!(!responses.contains(&InputMapperMessage::DoubleTap(Key::Space).into()));
 	}
+
+	#[test]
+	fn process_double_tap_held_too_long() {
+		let mut input_preprocessor = InputPreprocessorMessageHandler::default();
+		let mut responses = VecDeque::new();
+
+		key_down(&mut input_preprocessor, Key::Space, &mut responses);
+		key_up(&mut input_preprocessor, Key::Space, &mut responses);
+		responses.clear();
+
+		input_preprocessor.time = 50;
+		key_down(&mut input_preprocessor, Key::Space, &mut responses);
+		responses.clear();
+
+		// Release after the threshold
+		input_preprocessor.time = 50 + DOUBLE_CLICK_MILLISECONDS + 1;
+		key_up(&mut input_preprocessor, Key::Space, &mut responses);
+
+		assert!(!responses.contains(&InputMapperMessage::DoubleTap(Key::Space).into()));
+	}
+
+	#[test]
+	fn process_double_tap_interrupted_by_pointer() {
+		let mut input_preprocessor = InputPreprocessorMessageHandler::default();
+		let mut responses = VecDeque::new();
+
+		key_down(&mut input_preprocessor, Key::Space, &mut responses);
+		key_up(&mut input_preprocessor, Key::Space, &mut responses);
+		responses.clear();
+
+		input_preprocessor.time = 50;
+		key_down(&mut input_preprocessor, Key::Space, &mut responses);
+		responses.clear();
+
+		// PointerDown happens!
+		input_preprocessor.process_message(
+			InputPreprocessorMessage::PointerDown {
+				editor_mouse_state: EditorMouseState::default(),
+				modifier_keys: ModifierKeys::empty(),
+			},
+			&mut responses,
+			InputPreprocessorMessageContext {
+				viewport: &ViewportMessageHandler::default(),
+			},
+		);
+		responses.clear();
+
+		key_up(&mut input_preprocessor, Key::Space, &mut responses);
+
+		assert!(!responses.contains(&InputMapperMessage::DoubleTap(Key::Space).into()));
+	}
 }