Merge branch 'master' into pasting-offset

.devcontainer/devcontainer.json

@@ -6,7 +6,7 @@
 		},
 		"ghcr.io/devcontainers/features/node:1": {}
 	},
-	"onCreateCommand": "cargo install cargo-watch wasm-pack cargo-about && cargo install -f [email protected].99",
+	"onCreateCommand": "cargo install cargo-watch wasm-pack cargo-about && cargo install -f [email protected].100",
 	"customizations": {
 		"vscode": {
 			// NOTE: Keep this in sync with `.vscode/extensions.json`

Cargo.toml

@@ -63,10 +63,10 @@ spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu.git" }
 wgpu-types = "23"
 wgpu = "23"
 once_cell = "1.13" # Remove when `core::cell::LazyCell` (<https://doc.rust-lang.org/core/cell/struct.LazyCell.html>) is stabilized in Rust 1.80 and we bump our MSRV
-wasm-bindgen = "=0.2.99" # NOTICE: ensure this stays in sync with the `wasm-bindgen-cli` version in `website/content/volunteer/guide/project-setup/_index.md`. We pin this version because wasm-bindgen upgrades may break various things.
+wasm-bindgen = "=0.2.100" # NOTICE: ensure this stays in sync with the `wasm-bindgen-cli` version in `website/content/volunteer/guide/project-setup/_index.md`. We pin this version because wasm-bindgen upgrades may break various things.
 wasm-bindgen-futures = "0.4"
-js-sys = "=0.3.76"
-web-sys = "=0.3.76"
+js-sys = "=0.3.77"
+web-sys = "=0.3.77"
 winit = "0.29"
 url = "2.5"
 tokio = { version = "1.29", features = ["fs", "io-std"] }
@@ -80,6 +80,7 @@ base64 = "0.22"
 image = { version = "0.25", default-features = false, features = ["png"] }
 rustybuzz = "0.20"
 spirv = "0.3"
+pretty_assertions = "1.4.1"
 fern = { version = "0.7", features = ["colored"] }
 num_enum = "0.7"
 num-derive = "0.4"

deny.toml

@@ -45,6 +45,7 @@ db-urls = ["https://github.com/rustsec/advisory-db"]
 ignore = [
 	"RUSTSEC-2024-0370", # Unmaintained but still fully functional crate `proc-macro-error`
 	"RUSTSEC-2024-0388", # Unmaintained but still fully functional crate `derivative`
+	"RUSTSEC-2025-0007", # Unmaintained but still fully functional crate `ring`
 ]
 # Threshold for security vulnerabilities, any vulnerability with a CVSS score
 # lower than the range specified will be ignored. Note that ignored advisories

editor/build.rs

@@ -1,6 +1,6 @@
 use std::process::Command;
 
-const GRAPHITE_RELEASE_SERIES: &str = "Alpha 3";
+const GRAPHITE_RELEASE_SERIES: &str = "Alpha 4";
 
 fn main() {
 	// Execute a Git command for its stdout. Early exit if it fails for any of the possible reasons.

editor/src/consts.rs

@@ -73,10 +73,13 @@ pub const ANGLE_MEASURE_RADIUS_FACTOR: f64 = 0.04;
 pub const ARC_MEASURE_RADIUS_FACTOR_RANGE: (f64, f64) = (0.05, 0.15);
 
 // TRANSFORM CAGE
+pub const RESIZE_HANDLE_SIZE: f64 = 6.;
 pub const BOUNDS_SELECT_THRESHOLD: f64 = 10.;
 pub const BOUNDS_ROTATE_THRESHOLD: f64 = 20.;
 pub const MIN_LENGTH_FOR_MIDPOINT_VISIBILITY: f64 = 20.;
 pub const MIN_LENGTH_FOR_CORNERS_VISIBILITY: f64 = 12.;
+/// The width or height that the transform cage needs to be (at least) before the corner resize handle click targets take up their full surroundings. Otherwise, when less than this value, the interior edge resize handle takes precedence so the corner handles don't eat into the edge area, making it harder to resize the cage from its edges.
+pub const MIN_LENGTH_FOR_EDGE_RESIZE_PRIORITY_OVER_CORNERS: f64 = 10.;
 /// When the width or height of the transform cage is less than this value, only the exterior of the bounding box will act as a click target for resizing.
 pub const MIN_LENGTH_FOR_RESIZE_TO_INCLUDE_INTERIOR: f64 = 40.;
 /// When dragging the edge of a cage with Alt, it centers around the pivot.
@@ -85,6 +88,11 @@ pub const MIN_LENGTH_FOR_RESIZE_TO_INCLUDE_INTERIOR: f64 = 40.;
 /// The motion of the user's cursor by an `x` pixel offset results in `x * scale_factor` pixels of offset on the other side.
 pub const MAXIMUM_ALT_SCALE_FACTOR: f64 = 25.;
 
+// SKEW TRIANGLES
+pub const SKEW_TRIANGLE_SIZE: f64 = 7.;
+pub const SKEW_TRIANGLE_OFFSET: f64 = 4.;
+pub const MIN_LENGTH_FOR_SKEW_TRIANGLE_VISIBILITY: f64 = 48.;
+
 // PATH TOOL
 pub const MANIPULATOR_GROUP_MARKER_SIZE: f64 = 6.;
 pub const SELECTION_THRESHOLD: f64 = 10.;

editor/src/messages/dialog/preferences_dialog/preferences_dialog_message_handler.rs

@@ -33,13 +33,16 @@ impl PreferencesDialogMessageHandler {
 	const TITLE: &'static str = "Editor Preferences";
 
 	fn layout(&self, preferences: &PreferencesMessageHandler) -> Layout {
-		// =====
-		// INPUT
-		// =====
+		// ==========
+		// NAVIGATION
+		// ==========
+
+		let navigation_header = vec![TextLabel::new("Navigation").italic(true).widget_holder()];
 
 		let zoom_with_scroll_tooltip = "Use the scroll wheel for zooming instead of vertically panning (not recommended for trackpads)";
-		let input_section = vec![TextLabel::new("Input").italic(true).widget_holder()];
 		let zoom_with_scroll = vec![
+			Separator::new(SeparatorType::Unrelated).widget_holder(),
+			Separator::new(SeparatorType::Unrelated).widget_holder(),
 			CheckboxInput::new(preferences.zoom_with_scroll)
 				.tooltip(zoom_with_scroll_tooltip)
 				.on_update(|checkbox_input: &CheckboxInput| {
@@ -52,11 +55,18 @@ impl PreferencesDialogMessageHandler {
 			TextLabel::new("Zoom with Scroll").table_align(true).tooltip(zoom_with_scroll_tooltip).widget_holder(),
 		];
 
-		// =========
-		// SELECTION
-		// =========
+		// =======
+		// EDITING
+		// =======
+
+		let editing_header = vec![TextLabel::new("Editing").italic(true).widget_holder()];
+
+		let selection_label = vec![
+			Separator::new(SeparatorType::Unrelated).widget_holder(),
+			Separator::new(SeparatorType::Unrelated).widget_holder(),
+			TextLabel::new("Selection").widget_holder(),
+		];
 
-		let selection_section = vec![TextLabel::new("Selection").italic(true).widget_holder()];
 		let selection_mode = RadioInput::new(vec![
 			RadioEntryData::new(SelectionMode::Touched.to_string())
 				.label(SelectionMode::Touched.to_string())
@@ -88,33 +98,46 @@ impl PreferencesDialogMessageHandler {
 		])
 		.selected_index(Some(preferences.selection_mode as u32))
 		.widget_holder();
+		let selection_mode = vec![
+			Separator::new(SeparatorType::Unrelated).widget_holder(),
+			Separator::new(SeparatorType::Unrelated).widget_holder(),
+			selection_mode,
+		];
+
+		// ============
+		// EXPERIMENTAL
+		// ============
 
-		// ================
-		// NODE GRAPH WIRES
-		// ================
+		let experimental_header = vec![TextLabel::new("Experimental").italic(true).widget_holder()];
 
 		let node_graph_section_tooltip = "Appearance of the wires running between node connections in the graph";
-		let node_graph_section = vec![TextLabel::new("Node Graph Wires").tooltip(node_graph_section_tooltip).italic(true).widget_holder()];
+		let node_graph_wires_label = vec![
+			Separator::new(SeparatorType::Unrelated).widget_holder(),
+			Separator::new(SeparatorType::Unrelated).widget_holder(),
+			TextLabel::new("Node Graph Wires").tooltip(node_graph_section_tooltip).widget_holder(),
+		];
 		let graph_wire_style = RadioInput::new(vec![
-			RadioEntryData::new(GraphWireStyle::GridAligned.to_string())
-				.label(GraphWireStyle::GridAligned.to_string())
-				.tooltip(GraphWireStyle::GridAligned.tooltip_description())
-				.on_update(move |_| PreferencesMessage::GraphWireStyle { style: GraphWireStyle::GridAligned }.into()),
 			RadioEntryData::new(GraphWireStyle::Direct.to_string())
 				.label(GraphWireStyle::Direct.to_string())
 				.tooltip(GraphWireStyle::Direct.tooltip_description())
 				.on_update(move |_| PreferencesMessage::GraphWireStyle { style: GraphWireStyle::Direct }.into()),
+			RadioEntryData::new(GraphWireStyle::GridAligned.to_string())
+				.label(GraphWireStyle::GridAligned.to_string())
+				.tooltip(GraphWireStyle::GridAligned.tooltip_description())
+				.on_update(move |_| PreferencesMessage::GraphWireStyle { style: GraphWireStyle::GridAligned }.into()),
 		])
 		.selected_index(Some(preferences.graph_wire_style as u32))
 		.widget_holder();
-
-		// ============
-		// EXPERIMENTAL
-		// ============
+		let graph_wire_style = vec![
+			Separator::new(SeparatorType::Unrelated).widget_holder(),
+			Separator::new(SeparatorType::Unrelated).widget_holder(),
+			graph_wire_style,
+		];
 
 		let vello_tooltip = "Use the experimental Vello renderer (your browser must support WebGPU)";
-		let renderer_section = vec![TextLabel::new("Experimental").italic(true).widget_holder()];
 		let use_vello = vec![
+			Separator::new(SeparatorType::Unrelated).widget_holder(),
+			Separator::new(SeparatorType::Unrelated).widget_holder(),
 			CheckboxInput::new(preferences.use_vello && preferences.supports_wgpu())
 				.tooltip(vello_tooltip)
 				.disabled(!preferences.supports_wgpu())
@@ -129,6 +152,8 @@ impl PreferencesDialogMessageHandler {
 
 		let vector_mesh_tooltip = "Allow tools to produce vector meshes, where more than two segments can connect to an anchor point.\n\nCurrently this does not properly handle line joins and fills.";
 		let vector_meshes = vec![
+			Separator::new(SeparatorType::Unrelated).widget_holder(),
+			Separator::new(SeparatorType::Unrelated).widget_holder(),
 			CheckboxInput::new(preferences.vector_meshes)
 				.tooltip(vector_mesh_tooltip)
 				.on_update(|checkbox_input: &CheckboxInput| PreferencesMessage::VectorMeshes { enabled: checkbox_input.checked }.into())
@@ -158,13 +183,14 @@ impl PreferencesDialogMessageHandler {
 		// ];
 
 		Layout::WidgetLayout(WidgetLayout::new(vec![
-			LayoutGroup::Row { widgets: input_section },
+			LayoutGroup::Row { widgets: navigation_header },
 			LayoutGroup::Row { widgets: zoom_with_scroll },
-			LayoutGroup::Row { widgets: selection_section },
-			LayoutGroup::Row { widgets: vec![selection_mode] },
-			LayoutGroup::Row { widgets: node_graph_section },
-			LayoutGroup::Row { widgets: vec![graph_wire_style] },
-			LayoutGroup::Row { widgets: renderer_section },
+			LayoutGroup::Row { widgets: editing_header },
+			LayoutGroup::Row { widgets: selection_label },
+			LayoutGroup::Row { widgets: selection_mode },
+			LayoutGroup::Row { widgets: experimental_header },
+			LayoutGroup::Row { widgets: node_graph_wires_label },
+			LayoutGroup::Row { widgets: graph_wire_style },
 			LayoutGroup::Row { widgets: use_vello },
 			LayoutGroup::Row { widgets: vector_meshes },
 			// LayoutGroup::Row { widgets: imaginate_server_hostname },

editor/src/messages/input_mapper/input_mappings.rs

@@ -140,7 +140,7 @@ pub fn input_mappings() -> Mapping {
 		// NavigateToolMessage
 		entry!(KeyDown(MouseLeft); action_dispatch=NavigateToolMessage::ZoomCanvasBegin),
 		entry!(KeyDown(MouseLeft); modifiers=[Alt], action_dispatch=NavigateToolMessage::TiltCanvasBegin),
-		entry!(PointerMove; refresh_keys=[Control], action_dispatch=NavigateToolMessage::PointerMove { snap: Control }),
+		entry!(PointerMove; refresh_keys=[Shift], action_dispatch=NavigateToolMessage::PointerMove { snap: Shift }),
 		entry!(KeyUp(MouseLeft); action_dispatch=NavigateToolMessage::PointerUp { zoom_in: true }),
 		entry!(KeyUp(MouseLeft); modifiers=[Shift], action_dispatch=NavigateToolMessage::PointerUp { zoom_in: false }),
 		//
@@ -336,6 +336,7 @@ pub fn input_mappings() -> Mapping {
 		entry!(KeyDown(KeyG); modifiers=[Accel], action_dispatch=DocumentMessage::GroupSelectedLayers { group_folder_type: GroupFolderType::Layer }),
 		entry!(KeyDown(KeyG); modifiers=[Accel, Shift], action_dispatch=DocumentMessage::UngroupSelectedLayers),
 		entry!(KeyDown(KeyN); modifiers=[Accel, Shift], action_dispatch=DocumentMessage::CreateEmptyFolder),
+		entry!(KeyDown(Backslash); modifiers=[Alt], action_dispatch=DocumentMessage::SelectParentLayer),
 		entry!(KeyDown(BracketLeft); modifiers=[Alt], action_dispatch=DocumentMessage::SelectionStepBack),
 		entry!(KeyDown(BracketRight); modifiers=[Alt], action_dispatch=DocumentMessage::SelectionStepForward),
 		entry!(KeyDown(MouseBack); action_dispatch=DocumentMessage::SelectionStepBack),

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

@@ -60,6 +60,9 @@ pub enum DocumentMessage {
 	FlipSelectedLayers {
 		flip_axis: FlipAxis,
 	},
+	RotateSelectedLayers {
+		degrees: f64,
+	},
 	GraphViewOverlay {
 		open: bool,
 	},
@@ -109,6 +112,7 @@ pub enum DocumentMessage {
 	RenderRulers,
 	RenderScrollbars,
 	SaveDocument,
+	SelectParentLayer,
 	SelectAllLayers,
 	SelectedLayersLower,
 	SelectedLayersLowerToBack,