Merge branch 'master' into fix/vello-stroke-alignment-cropping

Author: ashishmohapatra240

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

@@ -1542,7 +1542,7 @@ impl MessageHandler<DocumentMessage, DocumentMessageContext<'_>> for DocumentMes
 					.default_node_template();
 				responses.add(NodeGraphMessage::InsertNode {
 					node_id,
-					node_template: new_artboard_node,
+					node_template: Box::new(new_artboard_node),
 				});
 				responses.add(NodeGraphMessage::ShiftNodePosition { node_id, x: 15, y: -3 });
 				responses.add(GraphOperationMessage::ResizeArtboard {

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

@@ -75,7 +75,8 @@ pub enum NodeGraphMessage {
 	},
 	InsertNode {
 		node_id: NodeId,
-		node_template: NodeTemplate,
+		// Boxed to reduce size of enum (1120 bytes to 8 bytes)
+		node_template: Box<NodeTemplate>,
 	},
 	InsertNodeBetween {
 		node_id: NodeId,

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

@@ -264,7 +264,7 @@ impl<'a> MessageHandler<NodeGraphMessage, NodeGraphMessageContext<'a>> for NodeG
 
 				responses.add(NodeGraphMessage::InsertNode {
 					node_id,
-					node_template: node_template.clone(),
+					node_template: Box::new(node_template.clone()),
 				});
 				responses.add(NodeGraphMessage::ShiftNodePosition { node_id, x, y });
 				// Only auto connect to the dragged wire if the node is being added to the currently opened network
@@ -507,7 +507,7 @@ impl<'a> MessageHandler<NodeGraphMessage, NodeGraphMessageContext<'a>> for NodeG
 				responses.add(NodeGraphMessage::UpdateImportsExports);
 			}
 			NodeGraphMessage::InsertNode { node_id, node_template } => {
-				network_interface.insert_node(node_id, node_template, selection_network_path);
+				network_interface.insert_node(node_id, *node_template, selection_network_path);
 			}
 			NodeGraphMessage::InsertNodeBetween {
 				node_id,
@@ -624,7 +624,7 @@ impl<'a> MessageHandler<NodeGraphMessage, NodeGraphMessageContext<'a>> for NodeG
 				responses.add(DocumentMessage::AddTransaction);
 				responses.add(NodeGraphMessage::InsertNode {
 					node_id: encapsulating_node_id,
-					node_template: default_node_template,
+					node_template: Box::new(default_node_template),
 				});
 				responses.add(NodeGraphMessage::SetDisplayNameImpl {
 					node_id: encapsulating_node_id,

editor/src/messages/tool/common_functionality/graph_modification_utils.rs

@@ -77,7 +77,7 @@ pub fn merge_layers(document: &DocumentMessageHandler, first_layer: LayerNodeIde
 		.default_node_template();
 	responses.add(NodeGraphMessage::InsertNode {
 		node_id: merge_node_id,
-		node_template: merge_node,
+		node_template: Box::new(merge_node),
 	});
 	responses.add(NodeGraphMessage::SetToNodeOrLayer {
 		node_id: merge_node_id,
@@ -103,7 +103,7 @@ pub fn merge_layers(document: &DocumentMessageHandler, first_layer: LayerNodeIde
 		.default_node_template();
 	responses.add(NodeGraphMessage::InsertNode {
 		node_id: flatten_node_id,
-		node_template: flatten_node,
+		node_template: Box::new(flatten_node),
 	});
 	responses.add(NodeGraphMessage::MoveNodeToChainStart {
 		node_id: flatten_node_id,
@@ -117,7 +117,7 @@ pub fn merge_layers(document: &DocumentMessageHandler, first_layer: LayerNodeIde
 		.default_node_template();
 	responses.add(NodeGraphMessage::InsertNode {
 		node_id: path_node_id,
-		node_template: path_node,
+		node_template: Box::new(path_node),
 	});
 	responses.add(NodeGraphMessage::MoveNodeToChainStart {
 		node_id: path_node_id,
@@ -132,7 +132,7 @@ pub fn merge_layers(document: &DocumentMessageHandler, first_layer: LayerNodeIde
 			.default_node_template();
 		responses.add(NodeGraphMessage::InsertNode {
 			node_id: spline_node_id,
-			node_template: spline_node,
+			node_template: Box::new(spline_node),
 		});
 		responses.add(NodeGraphMessage::MoveNodeToChainStart {
 			node_id: spline_node_id,
@@ -147,7 +147,7 @@ pub fn merge_layers(document: &DocumentMessageHandler, first_layer: LayerNodeIde
 		.default_node_template();
 	responses.add(NodeGraphMessage::InsertNode {
 		node_id: transform_node_id,
-		node_template: transform_node,
+		node_template: Box::new(transform_node),
 	});
 	responses.add(NodeGraphMessage::MoveNodeToChainStart {
 		node_id: transform_node_id,

editor/src/messages/tool/tool_messages/artboard_tool.rs

@@ -178,13 +178,18 @@ impl ArtboardToolData {
 		let Some(movement) = &bounds.selected_edges else {
 			return;
 		};
-		if self.selected_artboard == Some(LayerNodeIdentifier::ROOT_PARENT) {
+		let Some(selected_artboard) = self.selected_artboard else {
+			warn!("Attempted to resize artboard with no selected artboard");
+			self.bounding_box_manager.take(); // Remove the bounding box manager if there is no artboard.
+			return; // Just do nothing instead of crashing since the state likely isn't too broken.
+		};
+		if selected_artboard == LayerNodeIdentifier::ROOT_PARENT {
 			log::error!("Selected artboard cannot be ROOT_PARENT");
 			return;
 		}
 
 		let center = from_center.then_some(bounds.center_of_transformation);
-		let ignore = self.selected_artboard.map_or(Vec::new(), |layer| vec![layer]);
+		let ignore = vec![selected_artboard];
 		let snap = Some(SizeSnapData {
 			manager: &mut self.draw.snap_manager,
 			points: &mut self.snap_candidates,
@@ -196,14 +201,14 @@ impl ArtboardToolData {
 		let size = (max - min).abs();
 
 		responses.add(GraphOperationMessage::ResizeArtboard {
-			layer: self.selected_artboard.unwrap(),
+			layer: selected_artboard,
 			location: position.round().as_ivec2(),
 			dimensions: size.round().as_ivec2(),
 		});
 
 		let translation = position.round().as_ivec2() - self.dragging_current_artboard_location;
 		self.dragging_current_artboard_location = position.round().as_ivec2();
-		for child in self.selected_artboard.unwrap().children(document.metadata()) {
+		for child in selected_artboard.children(document.metadata()) {
 			let local_translation = document.metadata().downstream_transform_to_document(child).inverse().transform_vector2(-translation.as_dvec2());
 			responses.add(GraphOperationMessage::TransformChange {
 				layer: child,
@@ -235,6 +240,9 @@ impl Fsm for ArtboardToolFsmState {
 						bounding_box_manager.transform = document.metadata().document_to_viewport;
 
 						bounding_box_manager.render_overlays(&mut overlay_context, true);
+					} else {
+						// If the bounding box is not resolved (e.g. if the artboard is deleted), then discard the bounding box.
+						tool_data.bounding_box_manager.take();
 					}
 				} else {
 					tool_data.bounding_box_manager.take();

editor/src/messages/tool/tool_messages/path_tool.rs

@@ -1214,7 +1214,7 @@ impl PathToolData {
 
 			// Check if that segment exists or it has been removed
 			if let Some(vector_data) = document.network_interface.compute_modified_vector(layer)
-				&& !(vector_data.segment_domain.ids().iter().any(|segment| *segment == segment_id))
+				&& !(vector_data.segment_domain.ids().contains(&segment_id))
 			{
 				self.segment = None;
 			}

node-graph/gcore/src/vector/vector_nodes.rs

@@ -821,16 +821,17 @@ async fn vec2_to_point(_: impl Ctx, vec2: DVec2) -> Table<Vector> {
 async fn points_to_polyline(_: impl Ctx, mut points: Table<Vector>, #[default(true)] closed: bool) -> Table<Vector> {
 	for row in points.iter_mut() {
 		let mut segment_domain = SegmentDomain::new();
+		let mut next_id = SegmentId::ZERO;
 
 		let points_count = row.element.point_domain.ids().len();
 
 		if points_count > 2 {
 			(0..points_count - 1).for_each(|i| {
-				segment_domain.push(SegmentId::generate(), i, i + 1, BezierHandles::Linear, StrokeId::generate());
+				segment_domain.push(next_id.next_id(), i, i + 1, BezierHandles::Linear, StrokeId::generate());
 			});
 
 			if closed {
-				segment_domain.push(SegmentId::generate(), points_count - 1, 0, BezierHandles::Linear, StrokeId::generate());
+				segment_domain.push(next_id.next_id(), points_count - 1, 0, BezierHandles::Linear, StrokeId::generate());
 
 				row.element
 					.region_domain
@@ -1394,6 +1395,7 @@ async fn spline(_: impl Ctx, content: Table<Vector>) -> Table<Vector> {
 			}
 
 			let mut segment_domain = SegmentDomain::default();
+			let mut next_id = SegmentId::ZERO;
 			for (manipulator_groups, closed) in row.element.stroke_manipulator_groups() {
 				let positions = manipulator_groups.iter().map(|manipulators| manipulators.anchor).collect::<Vec<_>>();
 				let closed = closed && positions.len() > 2;
@@ -1418,7 +1420,7 @@ async fn spline(_: impl Ctx, content: Table<Vector>) -> Table<Vector> {
 					let handle_end = positions[next_index] * 2. - first_handles[next_index];
 					let handles = BezierHandles::Cubic { handle_start, handle_end };
 
-					segment_domain.push(SegmentId::generate(), start_index, end_index, handles, stroke_id);
+					segment_domain.push(next_id.next_id(), start_index, end_index, handles, stroke_id);
 				}
 			}
 

node-graph/node-macro/src/buffer_struct.rs

@@ -205,7 +205,7 @@ impl VisitMut for GenericsVisitor<'_> {
 	}
 
 	fn visit_path_segment_mut(&mut self, i: &mut PathSegment) {
-		if i.ident.to_string() == "Self" {
+		if i.ident == "Self" {
 			i.ident = self.self_ident.clone();
 		}
 		visit_mut::visit_path_segment_mut(self, i);

node-graph/node-macro/src/codegen.rs

@@ -287,7 +287,7 @@ pub(crate) fn generate_node_code(crate_ident: &CrateIdent, parsed: &ParsedNodeFn
 	let properties = &attributes.properties_string.as_ref().map(|value| quote!(Some(#value))).unwrap_or(quote!(None));
 
 	let cfg = crate::shader_nodes::modify_cfg(attributes);
-	let node_input_accessor = generate_node_input_references(parsed, fn_generics, &field_idents, &graphene_core, &identifier, &cfg);
+	let node_input_accessor = generate_node_input_references(parsed, fn_generics, &field_idents, graphene_core, &identifier, &cfg);
 	let ShaderTokens { shader_entry_point, gpu_node } = attributes.shader_node.as_ref().map(|n| n.codegen(crate_ident, parsed)).unwrap_or(Ok(ShaderTokens::default()))?;
 
 	Ok(quote! {

node-graph/node-macro/src/crate_ident.rs

@@ -30,16 +30,11 @@ impl Default for CrateIdent {
 				let name = format_ident!("{}", name);
 				Ok(quote!(::#name))
 			}
-			Err(e) => Err(syn::Error::new(Span::call_site(), &format!("Could not find dependency on `{orig_name}`:\n{e}"))),
+			Err(e) => Err(syn::Error::new(Span::call_site(), format!("Could not find dependency on `{orig_name}`:\n{e}"))),
 		};
 
 		let gcore = find_crate("graphene-core");
-		let gcore_shaders = find_crate("graphene-core-shaders").or_else(|eshaders| {
-			gcore
-				.as_ref()
-				.map(Clone::clone)
-				.map_err(|ecore| syn::Error::new(Span::call_site(), &format!("{ecore}\n\nFallback: {eshaders}")))
-		});
+		let gcore_shaders = find_crate("graphene-core-shaders").or_else(|eshaders| gcore.clone().map_err(|ecore| syn::Error::new(Span::call_site(), format!("{ecore}\n\nFallback: {eshaders}"))));
 		let wgpu_executor = find_crate("wgpu-executor");
 		Self { gcore, gcore_shaders, wgpu_executor }
 	}