Massively reorganize and clean up the whole Rust codebase (#478)

* Massively reorganize and clean up the whole Rust codebase * Additional changes during code review
2026-09-28 12:18:12 +08:00 · 2022-01-14 14:58:08 -08:00
parent 011c2be26d
commit f48d4e1884
85 changed files with 2515 additions and 2189 deletions
@@ -0,0 +1,213 @@
+use crate::document::DocumentMessageHandler;
+use crate::input::keyboard::{Key, MouseMotion};
+use crate::input::InputPreprocessorMessageHandler;
+use crate::message_prelude::*;
+use crate::misc::{HintData, HintGroup, HintInfo, KeysGroup};
+use crate::viewport_tools::tool::{DocumentToolData, Fsm, ToolActionHandlerData};
+
+use glam::DVec2;
+use serde::{Deserialize, Serialize};
+
+#[derive(Default)]
+pub struct Navigate {
+	fsm_state: NavigateToolFsmState,
+	data: NavigateToolData,
+}
+
+#[remain::sorted]
+#[impl_message(Message, ToolMessage, Navigate)]
+#[derive(PartialEq, Clone, Debug, Hash, Serialize, Deserialize)]
+pub enum NavigateMessage {
+	Abort,
+	ClickZoom { zoom_in: bool },
+	MouseMove { snap_angle: Key, snap_zoom: Key },
+	RotateCanvasBegin,
+	TransformCanvasEnd,
+	TranslateCanvasBegin,
+	ZoomCanvasBegin,
+}
+
+impl<'a> MessageHandler<ToolMessage, ToolActionHandlerData<'a>> for Navigate {
+	fn process_action(&mut self, action: ToolMessage, data: ToolActionHandlerData<'a>, responses: &mut VecDeque<Message>) {
+		if action == ToolMessage::UpdateHints {
+			self.fsm_state.update_hints(responses);
+			return;
+		}
+
+		let new_state = self.fsm_state.transition(action, data.0, data.1, &mut self.data, data.2, responses);
+
+		if self.fsm_state != new_state {
+			self.fsm_state = new_state;
+			self.fsm_state.update_hints(responses);
+		}
+	}
+
+	fn actions(&self) -> ActionList {
+		use NavigateToolFsmState::*;
+		match self.fsm_state {
+			Ready => actions!(NavigateMessageDiscriminant; TranslateCanvasBegin, RotateCanvasBegin, ZoomCanvasBegin),
+			_ => actions!(NavigateMessageDiscriminant; ClickZoom, MouseMove, TransformCanvasEnd),
+		}
+	}
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+enum NavigateToolFsmState {
+	Ready,
+	Panning,
+	Tilting,
+	Zooming,
+}
+
+impl Default for NavigateToolFsmState {
+	fn default() -> Self {
+		NavigateToolFsmState::Ready
+	}
+}
+
+#[derive(Clone, Debug, Default)]
+struct NavigateToolData {
+	drag_start: DVec2,
+}
+
+impl Fsm for NavigateToolFsmState {
+	type ToolData = NavigateToolData;
+
+	fn transition(
+		self,
+		message: ToolMessage,
+		_document: &DocumentMessageHandler,
+		_tool_data: &DocumentToolData,
+		data: &mut Self::ToolData,
+		input: &InputPreprocessorMessageHandler,
+		messages: &mut VecDeque<Message>,
+	) -> Self {
+		if let ToolMessage::Navigate(navigate) = message {
+			use NavigateMessage::*;
+
+			match navigate {
+				ClickZoom { zoom_in } => {
+					messages.push_front(MovementMessage::TransformCanvasEnd.into());
+
+					// Mouse has not moved from mousedown to mouseup
+					if data.drag_start == input.mouse.position {
+						messages.push_front(if zoom_in {
+							MovementMessage::IncreaseCanvasZoom { center_on_mouse: true }.into()
+						} else {
+							MovementMessage::DecreaseCanvasZoom { center_on_mouse: true }.into()
+						});
+					}
+
+					NavigateToolFsmState::Ready
+				}
+				MouseMove { snap_angle, snap_zoom } => {
+					messages.push_front(
+						MovementMessage::MouseMove {
+							snap_angle,
+							wait_for_snap_angle_release: false,
+							snap_zoom,
+							zoom_from_viewport: Some(data.drag_start),
+						}
+						.into(),
+					);
+					self
+				}
+				TranslateCanvasBegin => {
+					data.drag_start = input.mouse.position;
+					messages.push_front(MovementMessage::TranslateCanvasBegin.into());
+					NavigateToolFsmState::Panning
+				}
+				RotateCanvasBegin => {
+					data.drag_start = input.mouse.position;
+					messages.push_front(MovementMessage::RotateCanvasBegin.into());
+					NavigateToolFsmState::Tilting
+				}
+				ZoomCanvasBegin => {
+					data.drag_start = input.mouse.position;
+					messages.push_front(MovementMessage::ZoomCanvasBegin.into());
+					NavigateToolFsmState::Zooming
+				}
+				TransformCanvasEnd => {
+					messages.push_front(MovementMessage::TransformCanvasEnd.into());
+					NavigateToolFsmState::Ready
+				}
+				Abort => {
+					messages.push_front(MovementMessage::TransformCanvasEnd.into());
+					NavigateToolFsmState::Ready
+				}
+			}
+		} else {
+			self
+		}
+	}
+
+	fn update_hints(&self, responses: &mut VecDeque<Message>) {
+		let hint_data = match self {
+			NavigateToolFsmState::Ready => HintData(vec![
+				HintGroup(vec![
+					HintInfo {
+						key_groups: vec![],
+						mouse: Some(MouseMotion::Lmb),
+						label: String::from("Zoom In"),
+						plus: false,
+					},
+					HintInfo {
+						key_groups: vec![KeysGroup(vec![Key::KeyShift])],
+						mouse: None,
+						label: String::from("Zoom Out"),
+						plus: true,
+					},
+				]),
+				HintGroup(vec![
+					HintInfo {
+						key_groups: vec![],
+						mouse: Some(MouseMotion::LmbDrag),
+						label: String::from("Zoom"),
+						plus: false,
+					},
+					HintInfo {
+						key_groups: vec![KeysGroup(vec![Key::KeyControl])],
+						mouse: None,
+						label: String::from("Snap Increments"),
+						plus: true,
+					},
+				]),
+				HintGroup(vec![HintInfo {
+					key_groups: vec![],
+					mouse: Some(MouseMotion::MmbDrag),
+					label: String::from("Pan"),
+					plus: false,
+				}]),
+				HintGroup(vec![
+					HintInfo {
+						key_groups: vec![],
+						mouse: Some(MouseMotion::RmbDrag),
+						label: String::from("Tilt"),
+						plus: false,
+					},
+					HintInfo {
+						key_groups: vec![KeysGroup(vec![Key::KeyControl])],
+						mouse: None,
+						label: String::from("Snap 15°"),
+						plus: true,
+					},
+				]),
+			]),
+			NavigateToolFsmState::Tilting => HintData(vec![HintGroup(vec![HintInfo {
+				key_groups: vec![KeysGroup(vec![Key::KeyControl])],
+				mouse: None,
+				label: String::from("Snap 15°"),
+				plus: false,
+			}])]),
+			NavigateToolFsmState::Zooming => HintData(vec![HintGroup(vec![HintInfo {
+				key_groups: vec![KeysGroup(vec![Key::KeyControl])],
+				mouse: None,
+				label: String::from("Snap Increments"),
+				plus: false,
+			}])]),
+			_ => HintData(Vec::new()),
+		};
+
+		responses.push_back(FrontendMessage::UpdateInputHints { hint_data }.into());
+	}
+}