Remove double-tap tests (moved to separate PR) and add Ctrl+Space for Focus Document

Author: jsjgdh

editor/src/messages/input_mapper/input_mappings.rs

@@ -449,6 +449,7 @@ pub fn input_mappings(zoom_with_scroll: bool) -> Mapping {
 		entry!(KeyDown(KeyR); modifiers=[Alt], action_dispatch=PortfolioMessage::ToggleRulers),
 		entry!(KeyDown(KeyD); modifiers=[Alt], action_dispatch=PortfolioMessage::ToggleDataPanelOpen),
 		entry!(KeyDown(Enter); modifiers=[Alt], action_dispatch=PortfolioMessage::ToggleFocusDocument),
+		entry!(KeyDown(Space); modifiers=[Accel], action_dispatch=PortfolioMessage::ToggleFocusDocument),
 		//
 		// DialogMessage
 		entry!(KeyDown(KeyE); modifiers=[Accel], action_dispatch=DialogMessage::RequestExportDialog),

editor/src/messages/input_preprocessor/input_preprocessor_message_handler.rs

@@ -218,9 +218,8 @@ impl InputPreprocessorMessageHandler {
 
 #[cfg(test)]
 mod test {
-	use crate::consts::DOUBLE_CLICK_MILLISECONDS;
 	use crate::messages::input_mapper::utility_types::input_keyboard::{Key, ModifierKeys};
-	use crate::messages::input_mapper::utility_types::input_mouse::{EditorMouseState, MouseKeys, ScrollDelta};
+	use crate::messages::input_mapper::utility_types::input_mouse::{EditorMouseState, ScrollDelta};
 	use crate::messages::prelude::*;
 
 	#[test]
@@ -326,182 +325,4 @@ mod test {
 		assert!(responses.contains(&InputMapperMessage::KeyDown(Key::Control).into()));
 		assert!(responses.contains(&InputMapperMessage::KeyDown(Key::Control).into()));
 	}
-
-	fn key_down(input_preprocessor: &mut InputPreprocessorMessageHandler, key: Key, responses: &mut VecDeque<Message>) {
-		input_preprocessor.process_message(
-			InputPreprocessorMessage::KeyDown {
-				key,
-				key_repeat: false,
-				modifier_keys: ModifierKeys::empty(),
-			},
-			responses,
-			InputPreprocessorMessageContext {
-				viewport: &ViewportMessageHandler::default(),
-			},
-		);
-	}
-
-	fn key_up(input_preprocessor: &mut InputPreprocessorMessageHandler, key: Key, responses: &mut VecDeque<Message>) {
-		input_preprocessor.process_message(
-			InputPreprocessorMessage::KeyUp {
-				key,
-				key_repeat: false,
-				modifier_keys: ModifierKeys::empty(),
-			},
-			responses,
-			InputPreprocessorMessageContext {
-				viewport: &ViewportMessageHandler::default(),
-			},
-		);
-	}
-
-	fn process_input(input_preprocessor: &mut InputPreprocessorMessageHandler, message: InputPreprocessorMessage, responses: &mut VecDeque<Message>) {
-		input_preprocessor.process_message(
-			message,
-			responses,
-			InputPreprocessorMessageContext {
-				viewport: &ViewportMessageHandler::default(),
-			},
-		);
-	}
-
-	#[test]
-	fn process_double_tap_within_threshold() {
-		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);
-
-		assert!(!responses.contains(&InputMapperMessage::DoubleTap(Key::Space).into()));
-		assert_eq!(input_preprocessor.double_tap_key, Some((Key::Space, 50)));
-
-		responses.clear();
-		key_up(&mut input_preprocessor, Key::Space, &mut responses);
-
-		assert!(responses.contains(&InputMapperMessage::DoubleTap(Key::Space).into()));
-		assert!(input_preprocessor.double_tap_key.is_none());
-	}
-
-	#[test]
-	fn process_double_tap_outside_threshold() {
-		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 = DOUBLE_CLICK_MILLISECONDS + 1;
-		key_down(&mut input_preprocessor, Key::Space, &mut responses);
-
-		assert!(!responses.contains(&InputMapperMessage::DoubleTap(Key::Space).into()));
-		assert!(input_preprocessor.double_tap_key.is_none());
-
-		responses.clear();
-		key_up(&mut input_preprocessor, Key::Space, &mut responses);
-
-		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();
-
-		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_down() {
-		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();
-
-		process_input(
-			&mut input_preprocessor,
-			InputPreprocessorMessage::PointerDown {
-				editor_mouse_state: EditorMouseState::default(),
-				modifier_keys: ModifierKeys::empty(),
-			},
-			&mut responses,
-		);
-		responses.clear();
-
-		key_up(&mut input_preprocessor, Key::Space, &mut responses);
-
-		assert!(!responses.contains(&InputMapperMessage::DoubleTap(Key::Space).into()));
-	}
-
-	#[test]
-	fn process_double_tap_not_interrupted_by_mouse_movement() {
-		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();
-
-		process_input(
-			&mut input_preprocessor,
-			InputPreprocessorMessage::PointerMove {
-				editor_mouse_state: EditorMouseState::default(),
-				modifier_keys: ModifierKeys::empty(),
-			},
-			&mut responses,
-		);
-		responses.clear();
-
-		key_up(&mut input_preprocessor, Key::Space, &mut responses);
-
-		assert!(responses.contains(&InputMapperMessage::DoubleTap(Key::Space).into()));
-	}
-
-	#[test]
-	fn process_double_tap_blocked_by_mouse_button_held() {
-		let mut input_preprocessor = InputPreprocessorMessageHandler::default();
-		let mut responses = VecDeque::new();
-
-		input_preprocessor.mouse.mouse_keys = MouseKeys::LEFT;
-
-		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);
-
-		assert!(input_preprocessor.double_tap_key.is_none());
-
-		responses.clear();
-		key_up(&mut input_preprocessor, Key::Space, &mut responses);
-
-		assert!(!responses.contains(&InputMapperMessage::DoubleTap(Key::Space).into()));
-	}
 }