Small bug fixes

Author: adamgerhant

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

@@ -1007,8 +1007,9 @@ impl MessageHandler<DocumentMessage, DocumentMessageData<'_>> for DocumentMessag
 				if self.network_interface.transaction_status() == TransactionStatus::Finished {
 					return;
 				}
+
+				self.document_undo_history.pop_back();
 				self.network_interface.finish_transaction();
-				self.undo(ipp, responses);
 				responses.add(OverlaysMessage::Draw);
 			}
 			DocumentMessage::AddTransaction => {

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

@@ -111,7 +111,6 @@ impl<'a> MessageHandler<NodeGraphMessage, NodeGraphHandlerData<'a>> for NodeGrap
 				responses.add(NodeGraphMessage::SendSelectedNodes);
 				responses.add(ArtboardToolMessage::UpdateSelectedArtboard);
 				responses.add(DocumentMessage::DocumentStructureChanged);
-				responses.add(NodeGraphMessage::RunDocumentGraph);
 			}
 			NodeGraphMessage::CreateWire { output_connector, input_connector } => {
 				// TODO: Add support for flattening NodeInput::Network exports in flatten_with_fns https://github.com/GraphiteEditor/Graphite/issues/1762

editor/src/messages/portfolio/portfolio_message_handler.rs

@@ -376,7 +376,7 @@ impl MessageHandler<PortfolioMessage, PortfolioMessageData<'_>> for PortfolioMes
 				document_serialized_content,
 			} => {
 				// It can be helpful to temporarily set `upgrade_from_before_editable_subgraphs` to true if it's desired to upgrade a piece of artwork to use fresh copies of all nodes
-				let upgrade_from_before_editable_subgraphs = document_serialized_content.contains("node_output_index");
+				let upgrade_from_before_editable_subgraphs = true; //document_serialized_content.contains("node_output_index");
 				let upgrade_vector_manipulation_format = document_serialized_content.contains("ManipulatorGroupIds") && !document_name.contains("__DO_NOT_UPGRADE__");
 				let document_name = document_name.replace("__DO_NOT_UPGRADE__", "");
 

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

@@ -413,12 +413,13 @@ impl Fsm for SelectToolFsmState {
 				tool_data.selected_layers_changed = selected_layers_count != tool_data.selected_layers_count;
 				tool_data.selected_layers_count = selected_layers_count;
 
-				// Outline selected layers
+				// Outline selected layers, but not artboards
 				for layer in document
 					.network_interface
 					.selected_nodes(&[])
 					.unwrap()
 					.selected_visible_and_unlocked_layers(&document.network_interface)
+					.filter(|layer| !document.network_interface.is_artboard(&layer.to_node(), &[]))
 				{
 					overlay_context.outline(document.metadata().layer_outline(layer), document.metadata().transform_to_viewport(layer));
 				}
@@ -429,7 +430,7 @@ impl Fsm for SelectToolFsmState {
 					.selected_nodes(&[])
 					.unwrap()
 					.selected_visible_and_unlocked_layers(&document.network_interface)
-					.next()
+					.find(|layer| !document.network_interface.is_artboard(&layer.to_node(), &[]))
 					.map(|layer| document.metadata().transform_to_viewport(layer));
 				let transform = transform.unwrap_or(DAffine2::IDENTITY);
 				if transform.matrix2.determinant() == 0. {
@@ -440,6 +441,7 @@ impl Fsm for SelectToolFsmState {
 					.selected_nodes(&[])
 					.unwrap()
 					.selected_visible_and_unlocked_layers(&document.network_interface)
+					.filter(|layer| !document.network_interface.is_artboard(&layer.to_node(), &[]))
 					.filter_map(|layer| {
 						document
 							.metadata()

editor/src/node_graph_executor.rs

@@ -659,7 +659,7 @@ impl NodeGraphExecutor {
 			}
 			TaggedValue::RenderOutput(graphene_std::wasm_application_io::RenderOutput::Svg((svg, footprints))) => {
 				// Send to frontend
-				log::debug!("Render output footprints: {footprints:?}");
+				//log::debug!("Render output footprints: {footprints:?}");
 				responses.add(FrontendMessage::UpdateDocumentArtwork { svg });
 				responses.add(DocumentMessage::RenderScrollbars);
 				responses.add(DocumentMessage::RenderRulers);

node-graph/gcore/src/graphic_element/renderer.rs

@@ -330,10 +330,8 @@ impl GraphicElementRendered for GraphicGroup {
 	}
 
 	fn add_footprints(&self, footprints: &mut HashMap<NodeId, (Footprint, DAffine2)>, mut footprint: Footprint, _: Option<NodeId>) {
-		log::debug!("Transform for graphic group: {:?}", self.transform);
 		footprint.transform *= self.transform;
 		for (element, optional_node_id) in self.elements.iter() {
-			log::debug!("Optional node id: {:?}", optional_node_id);
 			if let Some(element_id) = optional_node_id {
 				let mut new_footprints = HashMap::new();
 				element.add_footprints(&mut new_footprints, footprint, Some(*element_id));
@@ -575,21 +573,13 @@ impl GraphicElementRendered for Artboard {
 			"g",
 			// Group tag attributes
 			|attributes| {
-				let matrix = format_transform_matrix(DAffine2::from_translation(self.location.as_dvec2()) * self.graphic_group.transform);
-				if !matrix.is_empty() {
-					attributes.push("transform", matrix);
-				}
-
 				if self.clip {
 					let id = format!("artboard-{}", generate_uuid());
 					let selector = format!("url(#{id})");
 
-					let matrix = format_transform_matrix(self.graphic_group.transform.inverse());
-					let transform = if matrix.is_empty() { String::new() } else { format!(r#" transform="{matrix}""#) };
-
 					write!(
 						&mut attributes.0.svg_defs,
-						r##"<clipPath id="{id}"><rect x="0" y="0" width="{}" height="{}"{transform} /></clipPath>"##,
+						r##"<clipPath id="{id}"><rect x="0" y="0" width="{}" height="{}"/></clipPath>"##,
 						self.dimensions.x, self.dimensions.y
 					)
 					.unwrap();
@@ -598,9 +588,7 @@ impl GraphicElementRendered for Artboard {
 			},
 			// Artboard contents
 			|render| {
-				for (element, _) in self.graphic_group.iter() {
-					element.render_svg(render, render_params);
-				}
+				self.graphic_group.render_svg(render, render_params);
 			},
 		);
 	}
@@ -637,16 +625,12 @@ impl GraphicElementRendered for Artboard {
 	}
 
 	fn add_click_targets(&self, click_targets: &mut Vec<ClickTarget>) {
-		let mut subpath = Subpath::new_rect(DVec2::ZERO, self.dimensions.as_dvec2());
-		subpath.apply_transform(self.graphic_group.transform.inverse());
+		let subpath = Subpath::new_rect(DVec2::ZERO, self.dimensions.as_dvec2());
 		click_targets.push(ClickTarget::new(subpath, 0.));
 	}
 
 	fn add_footprints(&self, footprints: &mut HashMap<NodeId, (Footprint, DAffine2)>, mut footprint: Footprint, node_id: Option<NodeId>) {
-		log::debug!("Adding footprints for artboard");
-		let mut graphic_group_footprint = footprint.clone();
-		graphic_group_footprint.transform *= self.transform();
-		self.graphic_group.add_footprints(footprints, graphic_group_footprint, None);
+		self.graphic_group.add_footprints(footprints, footprint, None);
 		// footprint.transform *= self.transform();
 		if let Some(node_id) = node_id {
 			footprints.insert(node_id, (footprint, DAffine2::from_translation(self.location.as_dvec2())));

node-graph/gcore/src/transform.rs

@@ -103,7 +103,7 @@ impl TransformMut for VectorData {
 
 impl Transform for Artboard {
 	fn transform(&self) -> DAffine2 {
-		DAffine2::from_translation(self.location.as_dvec2()) * self.graphic_group.transform
+		DAffine2::from_translation(self.location.as_dvec2())
 	}
 	fn local_pivot(&self, pivot: DVec2) -> DVec2 {
 		self.location.as_dvec2() + self.dimensions.as_dvec2() * pivot

node-graph/graph-craft/src/document.rs

@@ -1107,7 +1107,6 @@ impl NodeNetwork {
 			let previous_export = std::mem::replace(export, NodeInput::network(concrete!(()), 0));
 			if let NodeInput::Value { mut tagged_value, exposed } = previous_export {
 				if matches!(*tagged_value, TaggedValue::OptionalNodeId(None)) {
-					log::debug!("id: {id} path: {path:?}");
 					if let Some(encapsulating_layer) = path.get((path.len() - 2).max(0) as usize) {
 						tagged_value = TaggedValue::OptionalNodeId(Some(*encapsulating_layer)).into();
 					}