Merge branch 'master' into path_editing_clutter

Author: 4adex

Cargo.lock

@@ -48,14 +48,14 @@ env_logger = "0.11"
 log = "0.4"
 bitflags = { version = "2.4", features = ["serde"] }
 ctor = "0.2"
-convert_case = "0.6"
+convert_case = "0.7"
 derivative = "2.2"
 tempfile = "3.6"
 thiserror = "2"
 anyhow = "1.0"
 proc-macro2 = "1"
 quote = "1.0"
-axum = "0.7"
+axum = "0.8"
 chrono = "0.4"
 ron = "0.8"
 fastnoise-lite = "1.1"
@@ -73,18 +73,18 @@ tokio = { version = "1.29", features = ["fs", "io-std"] }
 vello = { git = "https://github.com/linebender/vello.git", rev = "3275ec8" } # TODO switch back to stable when a release is made
 resvg = "0.44"
 usvg = "0.44"
-rand = { version = "0.8", default-features = false }
-rand_chacha = "0.3"
+rand = { version = "0.9", default-features = false }
+rand_chacha = "0.9"
 glam = { version = "0.29", default-features = false, features = ["serde"] }
 base64 = "0.22"
 image = { version = "0.25", default-features = false, features = ["png"] }
 rustybuzz = "0.20"
 spirv = "0.3"
-fern = { version = "0.6", features = ["colored"] }
+fern = { version = "0.7", features = ["colored"] }
 num_enum = "0.7"
 num-derive = "0.4"
 num-traits = { version = "0.2", default-features = false, features = ["i128"] }
-specta = { git = "https://github.com/0hypercube/specta.git", features = [
+specta = { git = "https://github.com/specta-rs/specta.git", features = [
 	"glam",
 	"derive",
 	# "typescript",

Cargo.toml

@@ -43,8 +43,8 @@ db-urls = ["https://github.com/rustsec/advisory-db"]
 # A list of advisory IDs to ignore. Note that ignored advisories will still
 # output a note when they are encountered.
 ignore = [
-	"RUSTSEC-2024-0370", # I don't care about unmaintained proc-macro-error
-	"RUSTSEC-2024-0388", # I don't care about unmaintained derivative
+	"RUSTSEC-2024-0370", # Unmaintained but still fully functional crate `proc-macro-error`
+	"RUSTSEC-2024-0388", # Unmaintained but still fully functional crate `derivative`
 ]
 # Threshold for security vulnerabilities, any vulnerability with a CVSS score
 # lower than the range specified will be ignored. Note that ignored advisories
@@ -78,6 +78,7 @@ allow = [
 	"OpenSSL",
 	"Unicode-3.0",
 	"Zlib",
+	"NCSA",
 ]
 # The confidence threshold for detecting a license from license text.
 # The higher the value, the more closely the license text must be to the
@@ -183,7 +184,7 @@ allow-git = []
 
 [sources.allow-org]
 # 1 or more github.com organizations to allow git sources for
-github = ["linebender", "Rust-GPU", "0hypercube"]
+github = ["linebender", "Rust-GPU", "specta-rs"]
 # 1 or more gitlab.com organizations to allow git sources for
 #gitlab = [""]
 # 1 or more bitbucket.org organizations to allow git sources for

deny.toml

@@ -41,8 +41,8 @@ pub const MAX_LAYER_SNAP_POINTS: usize = 100;
 pub const DRAG_THRESHOLD: f64 = 1.;
 
 // TRANSFORMING LAYER
-pub const ROTATE_SNAP_ANGLE: f64 = 15.;
-pub const SCALE_SNAP_INTERVAL: f64 = 0.1;
+pub const ROTATE_INCREMENT: f64 = 15.;
+pub const SCALE_INCREMENT: f64 = 0.1;
 pub const SLOWING_DIVISOR: f64 = 10.;
 pub const NUDGE_AMOUNT: f64 = 1.;
 pub const BIG_NUDGE_AMOUNT: f64 = 10.;

editor/src/consts.rs

@@ -92,11 +92,9 @@ impl InputMapperMessageHandler {
 					.collect::<Vec<_>>();
 
 				// Append the key button for the entry
+				use InputMapperMessage as IMM;
 				match entry.input {
-					InputMapperMessage::KeyDown(key) => keys.push(key),
-					InputMapperMessage::KeyUp(key) => keys.push(key),
-					InputMapperMessage::KeyDownNoRepeat(key) => keys.push(key),
-					InputMapperMessage::KeyUpNoRepeat(key) => keys.push(key),
+					IMM::KeyDown(key) | IMM::KeyUp(key) | IMM::KeyDownNoRepeat(key) | IMM::KeyUpNoRepeat(key) => keys.push(key),
 					_ => (),
 				}
 

editor/src/messages/input_mapper/input_mapper_message_handler.rs

@@ -37,7 +37,7 @@ pub fn input_mappings() -> Mapping {
 		// ===============
 		//
 		// NavigationMessage
-		entry!(PointerMove; refresh_keys=[Control], action_dispatch=NavigationMessage::PointerMove { snap: Control }),
+		entry!(PointerMove; refresh_keys=[Shift], action_dispatch=NavigationMessage::PointerMove { snap: Shift }),
 		entry!(KeyUp(MouseLeft); action_dispatch=NavigationMessage::EndCanvasPTZ { abort_transform: false }),
 		entry!(KeyUp(MouseMiddle); action_dispatch=NavigationMessage::EndCanvasPTZ { abort_transform: false }),
 		entry!(KeyUp(MouseRight); action_dispatch=NavigationMessage::EndCanvasPTZ { abort_transform: false }),
@@ -74,7 +74,6 @@ pub fn input_mappings() -> Mapping {
 		entry!(KeyDown(KeyH); modifiers=[Accel], action_dispatch=NodeGraphMessage::ToggleSelectedVisibility),
 		entry!(KeyDown(KeyL); modifiers=[Accel], action_dispatch=NodeGraphMessage::ToggleSelectedLocked),
 		entry!(KeyDown(KeyL); modifiers=[Alt], action_dispatch=NodeGraphMessage::ToggleSelectedAsLayersOrNodes),
-		entry!(KeyDown(KeyC); modifiers=[Shift], action_dispatch=NodeGraphMessage::PrintSelectedNodeCoordinates),
 		entry!(KeyDown(KeyC); modifiers=[Alt], action_dispatch=NodeGraphMessage::SendClickTargets),
 		entry!(KeyDown(KeyM); modifiers=[Accel], action_dispatch=NodeGraphMessage::MergeSelectedNodes),
 		entry!(KeyUp(KeyC); action_dispatch=NodeGraphMessage::EndSendClickTargets),
@@ -97,8 +96,8 @@ pub fn input_mappings() -> Mapping {
 		entry!(PointerMove; refresh_keys=[Control, Shift], action_dispatch=TransformLayerMessage::PointerMove { slow_key: Shift, increments_key: Control }),
 		//
 		// SelectToolMessage
-		entry!(PointerMove; refresh_keys=[Control, Alt, Shift], action_dispatch=SelectToolMessage::PointerMove(SelectToolPointerKeys { axis_align: Shift, snap_angle: Control, center: Alt, duplicate: Alt })),
-		entry!(KeyDown(MouseLeft); action_dispatch=SelectToolMessage::DragStart { extend_selection: Shift, remove_from_selection: Alt, select_deepest: Accel, lasso_select: Control }),
+		entry!(PointerMove; refresh_keys=[Control, Alt, Shift], action_dispatch=SelectToolMessage::PointerMove(SelectToolPointerKeys { axis_align: Shift, snap_angle: Shift, center: Alt, duplicate: Alt })),
+		entry!(KeyDown(MouseLeft); action_dispatch=SelectToolMessage::DragStart { extend_selection: Shift, remove_from_selection: Alt, select_deepest: Accel, lasso_select: Control, skew: Control }),
 		entry!(KeyUp(MouseLeft); action_dispatch=SelectToolMessage::DragStop { remove_from_selection: Alt }),
 		entry!(KeyDown(Enter); action_dispatch=SelectToolMessage::Enter),
 		entry!(DoubleClick(MouseButton::Left); action_dispatch=SelectToolMessage::EditLayer),
@@ -212,7 +211,7 @@ pub fn input_mappings() -> Mapping {
 		entry!(KeyDown(Backspace); modifiers=[Accel], action_dispatch=PathToolMessage::DeleteAndBreakPath),
 		entry!(KeyDown(Delete); modifiers=[Shift], action_dispatch=PathToolMessage::BreakPath),
 		entry!(KeyDown(Backspace); modifiers=[Shift], action_dispatch=PathToolMessage::BreakPath),
-		entry!(KeyDown(Tab); action_dispatch=PathToolMessage::SwapSelectedHandles),
+		entry!(KeyDownNoRepeat(Tab); action_dispatch=PathToolMessage::SwapSelectedHandles),
 		entry!(KeyDown(MouseLeft); action_dispatch=PathToolMessage::MouseDown { direct_insert_without_sliding: Control, extend_selection: Shift, lasso_select: Control }),
 		entry!(KeyDown(MouseRight); action_dispatch=PathToolMessage::RightClick),
 		entry!(KeyDown(Escape); action_dispatch=PathToolMessage::Escape),
@@ -254,7 +253,7 @@ pub fn input_mappings() -> Mapping {
 		entry!(KeyDown(KeyJ); modifiers=[Accel], action_dispatch=ToolMessage::Path(PathToolMessage::ClosePath)),
 		//
 		// PenToolMessage
-		entry!(PointerMove; refresh_keys=[Control, Alt, Shift], action_dispatch=PenToolMessage::PointerMove { snap_angle: Shift, break_handle: Alt, lock_angle: Control}),
+		entry!(PointerMove; refresh_keys=[Control, Alt, Shift, KeyC], action_dispatch=PenToolMessage::PointerMove { snap_angle: Shift, break_handle: Alt, lock_angle: Control, colinear: KeyC }),
 		entry!(KeyDown(MouseLeft); action_dispatch=PenToolMessage::DragStart { append_to_selected: Shift }),
 		entry!(KeyUp(MouseLeft); action_dispatch=PenToolMessage::DragStop),
 		entry!(KeyDown(MouseRight); action_dispatch=PenToolMessage::Confirm),
@@ -321,7 +320,6 @@ pub fn input_mappings() -> Mapping {
 		entry!(KeyUp(Escape); action_dispatch=DocumentMessage::Escape),
 		entry!(KeyDown(Delete); action_dispatch=DocumentMessage::DeleteSelectedLayers),
 		entry!(KeyDown(Backspace); action_dispatch=DocumentMessage::DeleteSelectedLayers),
-		entry!(KeyDown(KeyP); modifiers=[Alt], action_dispatch=DocumentMessage::DebugPrintDocument),
 		entry!(KeyDown(KeyO); modifiers=[Alt], action_dispatch=DocumentMessage::ToggleOverlaysVisibility),
 		entry!(KeyDown(KeyS); modifiers=[Alt], action_dispatch=DocumentMessage::ToggleSnapping),
 		entry!(KeyDown(KeyH); modifiers=[Accel], action_dispatch=DocumentMessage::ToggleSelectedVisibility),
@@ -391,8 +389,9 @@ pub fn input_mappings() -> Mapping {
 		//
 		// NavigationMessage
 		entry!(KeyDown(MouseMiddle); modifiers=[Alt], action_dispatch=NavigationMessage::BeginCanvasTilt { was_dispatched_from_menu: false }),
-		entry!(KeyDown(MouseMiddle); modifiers=[Shift], action_dispatch=NavigationMessage::BeginCanvasZoom),
-		entry!(KeyDown(MouseLeft); modifiers=[Shift, Space], action_dispatch=NavigationMessage::BeginCanvasZoom),
+		entry!(KeyDown(MouseLeft); modifiers=[Alt, Space], action_dispatch=NavigationMessage::BeginCanvasTilt { was_dispatched_from_menu: false }),
+		entry!(KeyDown(MouseMiddle); modifiers=[Control], action_dispatch=NavigationMessage::BeginCanvasZoom),
+		entry!(KeyDown(MouseLeft); modifiers=[Control, Space], action_dispatch=NavigationMessage::BeginCanvasZoom),
 		entry!(KeyDown(MouseMiddle); action_dispatch=NavigationMessage::BeginCanvasPan),
 		entry!(KeyDown(MouseLeft); modifiers=[Space], action_dispatch=NavigationMessage::BeginCanvasPan),
 		entry!(KeyDown(NumpadAdd); modifiers=[Accel], action_dispatch=NavigationMessage::CanvasZoomIncrease { center_on_mouse: false }),
@@ -427,23 +426,26 @@ pub fn input_mappings() -> Mapping {
 		entry!(KeyDown(Comma); modifiers=[Accel], action_dispatch=DialogMessage::RequestPreferencesDialog),
 		//
 		// DebugMessage
-		entry!(KeyDown(KeyT); modifiers=[Alt], action_dispatch=DebugMessage::ToggleTraceLogs),
 		entry!(KeyDown(Digit0); modifiers=[Alt], action_dispatch=DebugMessage::MessageOff),
 		entry!(KeyDown(Digit1); modifiers=[Alt], action_dispatch=DebugMessage::MessageNames),
 		entry!(KeyDown(Digit2); modifiers=[Alt], action_dispatch=DebugMessage::MessageContents),
 	];
 	let (mut key_up, mut key_down, mut key_up_no_repeat, mut key_down_no_repeat, mut double_click, mut wheel_scroll, mut pointer_move) = mappings;
 
-	let sort = |list: &mut KeyMappingEntries| list.0.sort_by(|u, v| v.modifiers.ones().cmp(&u.modifiers.ones()));
+	let sort = |list: &mut KeyMappingEntries| list.0.sort_by(|a, b| b.modifiers.count_ones().cmp(&a.modifiers.count_ones()));
+	// Sort the sublists of `key_up`, `key_down`, `key_up_no_repeat`, and `key_down_no_repeat`
 	for list in [&mut key_up, &mut key_down, &mut key_up_no_repeat, &mut key_down_no_repeat] {
 		for sublist in list {
 			sort(sublist);
 		}
 	}
+	// Sort the sublists of `double_click`
 	for sublist in &mut double_click {
 		sort(sublist)
 	}
+	// Sort `wheel_scroll`
 	sort(&mut wheel_scroll);
+	// Sort `pointer_move`
 	sort(&mut pointer_move);
 
 	Mapping {

editor/src/messages/input_mapper/input_mappings.rs

@@ -434,7 +434,7 @@ impl<const LENGTH: usize> BitVector<LENGTH> {
 		result == 0
 	}
 
-	pub fn ones(&self) -> u32 {
+	pub fn count_ones(&self) -> u32 {
 		let mut result = 0;
 
 		for storage in self.0.iter() {

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

@@ -1,4 +1,4 @@
-use super::input_keyboard::{all_required_modifiers_pressed, KeysGroup, LayoutKeysGroup};
+use super::input_keyboard::{all_required_modifiers_pressed, Key, KeysGroup, LayoutKeysGroup};
 use crate::messages::input_mapper::key_mapping::MappingVariant;
 use crate::messages::input_mapper::utility_types::input_keyboard::{KeyStates, NUMBER_OF_KEYS};
 use crate::messages::input_mapper::utility_types::input_mouse::NUMBER_OF_MOUSE_BUTTONS;
@@ -134,7 +134,29 @@ impl ActionKeys {
 	pub fn to_keys(&mut self, action_input_mapping: &impl Fn(&MessageDiscriminant) -> Vec<KeysGroup>) -> String {
 		match self {
 			Self::Action(action) => {
-				if let Some(keys) = action_input_mapping(action).get_mut(0) {
+				// Take the shortest sequence of keys
+				let mut key_sequences = action_input_mapping(action);
+				key_sequences.sort_by_key(|keys| keys.0.len());
+				let mut secondary_key_sequence = key_sequences.get(1).cloned();
+				let mut key_sequence = key_sequences.get_mut(0);
+
+				// TODO: Replace this exception with a per-action choice of canonical hotkey
+				if let Some(key_sequence) = &mut key_sequence {
+					if key_sequence.0.as_slice() == [Key::MouseBack] {
+						if let Some(replacement) = &mut secondary_key_sequence {
+							std::mem::swap(*key_sequence, replacement);
+						}
+					}
+				}
+				if let Some(key_sequence) = &mut key_sequence {
+					if key_sequence.0.as_slice() == [Key::MouseForward] {
+						if let Some(replacement) = &mut secondary_key_sequence {
+							std::mem::swap(*key_sequence, replacement);
+						}
+					}
+				}
+
+				if let Some(keys) = key_sequence {
 					let mut taken_keys = KeysGroup::default();
 					std::mem::swap(keys, &mut taken_keys);
 					let description = taken_keys.to_string();

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

@@ -1235,7 +1235,7 @@ impl MessageHandler<DocumentMessage, DocumentMessageData<'_>> for DocumentMessag
 					// Ensure selection box is kept in sync with the pointer when the PTZ changes
 					responses.add(SelectToolMessage::PointerMove(SelectToolPointerKeys {
 						axis_align: Key::Shift,
-						snap_angle: Key::Control,
+						snap_angle: Key::Shift,
 						center: Key::Alt,
 						duplicate: Key::Alt,
 					}));

editor/src/messages/portfolio/document/document_message_handler.rs

@@ -3,7 +3,7 @@ use crate::consts::{
 	VIEWPORT_ZOOM_TO_FIT_PADDING_SCALE_FACTOR, VIEWPORT_ZOOM_WHEEL_RATE,
 };
 use crate::messages::frontend::utility_types::MouseCursorIcon;
-use crate::messages::input_mapper::utility_types::input_keyboard::{Key, KeysGroup, MouseMotion};
+use crate::messages::input_mapper::utility_types::input_keyboard::{Key, MouseMotion};
 use crate::messages::input_mapper::utility_types::input_mouse::ViewportPosition;
 use crate::messages::portfolio::document::navigation::utility_types::NavigationOperation;
 use crate::messages::portfolio::document::utility_types::misc::PTZ;
@@ -95,14 +95,7 @@ impl MessageHandler<NavigationMessage, NavigationMessageData<'_>> for Navigation
 					responses.add(FrontendMessage::UpdateInputHints {
 						hint_data: HintData(vec![
 							HintGroup(vec![HintInfo::mouse(MouseMotion::Rmb, ""), HintInfo::keys([Key::Escape], "Cancel").prepend_slash()]),
-							HintGroup(vec![HintInfo {
-								key_groups: vec![KeysGroup(vec![Key::Control]).into()],
-								key_groups_mac: None,
-								mouse: None,
-								label: "Snap 15°".into(),
-								plus: false,
-								slash: false,
-							}]),
+							HintGroup(vec![HintInfo::keys([Key::Shift], "15° Increments")]),
 						]),
 					});
 
@@ -125,14 +118,7 @@ impl MessageHandler<NavigationMessage, NavigationMessageData<'_>> for Navigation
 				responses.add(FrontendMessage::UpdateInputHints {
 					hint_data: HintData(vec![
 						HintGroup(vec![HintInfo::mouse(MouseMotion::Rmb, ""), HintInfo::keys([Key::Escape], "Cancel").prepend_slash()]),
-						HintGroup(vec![HintInfo {
-							key_groups: vec![KeysGroup(vec![Key::Control]).into()],
-							key_groups_mac: None,
-							mouse: None,
-							label: "Increments".into(),
-							plus: false,
-							slash: false,
-						}]),
+						HintGroup(vec![HintInfo::keys([Key::Shift], "Increments")]),
 					]),
 				});
 

editor/src/messages/portfolio/document/navigation/navigation_message_handler.rs

@@ -96,7 +96,6 @@ pub enum NodeGraphMessage {
 	PointerOutsideViewport {
 		shift: Key,
 	},
-	PrintSelectedNodeCoordinates,
 	RemoveImport {
 		import_index: usize,
 	},

editor/src/messages/portfolio/document/node_graph/node_graph_message.rs

@@ -1229,44 +1229,6 @@ impl<'a> MessageHandler<NodeGraphMessage, NodeGraphHandlerData<'a>> for NodeGrap
 					self.auto_panning.stop(&messages, responses);
 				}
 			}
-			NodeGraphMessage::PrintSelectedNodeCoordinates => {
-				// TODO: This will also have to print all metadata
-				// for (_, node_to_print) in network
-				// 	.nodes
-				// 	.iter()
-				// 	.filter(|node_id| selected_nodes.selected_nodes().any(|selected_id| selected_id == node_id.0))
-				// {
-				// 	if let DocumentNodeImplementation::Network(network) = &node_to_print.implementation {
-				// 		let mut output = "\r\n\r\n".to_string();
-				// 		output += &node_to_print.name;
-				// 		output += ":\r\n\r\n";
-				// 		let mut nodes = network.nodes.iter().collect::<Vec<_>>();
-				// 		nodes.sort_by_key(|(a, _)| a.0);
-				// 		output += &nodes
-				// 			.iter()
-				// 			.map(|(_, node)| {
-				// 				format!(
-				// 					"metadata: DocumentNodeMetadata {{ position: glam::IVec2::new({}, {}) }}, // {}",
-				// 					node.metadata().position.x, node.metadata().position.y, node.name
-				// 				)
-				// 			})
-				// 			.collect::<Vec<_>>()
-				// 			.join("\r\n");
-				// 		output += "\r\n";
-				// 		output += &format!(
-				// 			"imports_metadata: (NodeId::new(), ({}, {}).into()),\r\n",
-				// 			network.imports_metadata.1.x, network.imports_metadata.1.y
-				// 		);
-				// 		output += &format!(
-				// 			"exports_metadata: (NodeId::new(), ({}, {}).into()),",
-				// 			network.exports_metadata.1.x, network.exports_metadata.1.y
-				// 		);
-				// 		output += "\r\n\r\n";
-				// 		// KEEP THIS `debug!()` - Someday we can remove this once this development utility is no longer needed
-				// 		log::debug!("{output}");
-				// 	}
-				// }
-			}
 			NodeGraphMessage::RemoveImport { import_index: usize } => {
 				network_interface.remove_import(usize, selection_network_path);
 				responses.add(NodeGraphMessage::SendGraph);
@@ -1738,7 +1700,6 @@ impl NodeGraphMessageHandler {
 				ToggleSelectedAsLayersOrNodes,
 				ToggleSelectedLocked,
 				ToggleSelectedVisibility,
-				PrintSelectedNodeCoordinates,
 				ShiftSelectedNodes,
 			));
 		}

editor/src/messages/portfolio/document/node_graph/node_graph_message_handler.rs

@@ -47,7 +47,7 @@ impl OverlayContext {
 	}
 
 	pub fn polygon(&mut self, polygon: &[DVec2], color_fill: Option<&str>) {
-		self.dashed_polygon(&polygon, color_fill, None, None, None);
+		self.dashed_polygon(polygon, color_fill, None, None, None);
 	}
 
 	pub fn dashed_polygon(&mut self, polygon: &[DVec2], color_fill: Option<&str>, dash_width: Option<f64>, dash_gap_width: Option<f64>, dash_offset: Option<f64>) {