Merge branch 'master' into node-graph-ux-fixes

Author: Keavon

demo-artwork/changing-seasons.graphite

@@ -498,9 +498,14 @@ mod test {
 			println!("-------------------------------------------------");
 			println!("Failed test due to receiving a DisplayDialogError while loading a Graphite demo file.");
 			println!();
+			println!("NOTE:");
+			println!("Document upgrading isn't performed in tests like when opening in the actual editor.");
+			println!("You may need to open and re-save a document in the editor to apply its migrations.");
+			println!();
 			println!("DisplayDialogError details:");
 			println!();
-			println!("Description: {value}");
+			println!("Description:");
+			println!("{value}");
 			println!("-------------------------------------------------");
 			println!();
 
@@ -538,7 +543,9 @@ mod test {
 			});
 
 			// Check if the graph renders
-			editor.eval_graph().await;
+			if let Err(e) = editor.eval_graph().await {
+				print_problem_to_terminal_on_failure(&format!("Failed to evaluate the graph for document '{document_name}':\n{e}"));
+			}
 
 			for response in responses {
 				// Check for the existence of the file format incompatibility warning dialog after opening the test file

demo-artwork/isometric-fountain.graphite

@@ -30,7 +30,7 @@ use glam::{DAffine2, DVec2, IVec2};
 use graph_craft::document::value::TaggedValue;
 use graph_craft::document::{NodeId, NodeInput, NodeNetwork, OldNodeNetwork};
 use graphene_core::raster::BlendMode;
-use graphene_core::raster::image::ImageFrameTable;
+use graphene_core::raster::image::RasterDataTable;
 use graphene_core::vector::style::ViewMode;
 use graphene_std::renderer::{ClickTarget, Quad};
 use graphene_std::vector::{PointId, path_bool_lib};
@@ -690,38 +690,41 @@ impl MessageHandler<DocumentMessage, DocumentMessageData<'_>> for DocumentMessag
 					.iter()
 					.map(|layer| {
 						if layer.parent(self.metadata()) != Some(parent) {
-							(*layer, 0)
-						} else {
-							let upstream_selected_siblings = layer
-								.downstream_siblings(self.network_interface.document_metadata())
-								.filter(|sibling| {
-									sibling != layer
-										&& layers_to_move.iter().any(|layer| {
-											layer == sibling
-												&& layer
-													.parent(self.metadata())
-													.is_some_and(|parent| parent.children(self.metadata()).position(|child| child == *layer) < Some(insert_index))
-										})
-								})
-								.count();
-							(*layer, upstream_selected_siblings)
+							return (*layer, 0);
 						}
+
+						let upstream_selected_siblings = layer
+							.downstream_siblings(self.network_interface.document_metadata())
+							.filter(|sibling| {
+								sibling != layer
+									&& layers_to_move.iter().any(|layer| {
+										layer == sibling
+											&& layer
+												.parent(self.metadata())
+												.is_some_and(|parent| parent.children(self.metadata()).position(|child| child == *layer) < Some(insert_index))
+									})
+							})
+							.count();
+						(*layer, upstream_selected_siblings)
 					})
 					.collect::<Vec<_>>();
 
 				responses.add(DocumentMessage::AddTransaction);
+
 				for (layer_index, (layer_to_move, insert_offset)) in layers_to_move_with_insert_offset.into_iter().enumerate() {
-					let calculated_insert_index = insert_index + layer_index - insert_offset;
 					responses.add(NodeGraphMessage::MoveLayerToStack {
 						layer: layer_to_move,
 						parent,
-						insert_index: calculated_insert_index,
+						insert_index: insert_index + layer_index - insert_offset,
 					});
 
 					if layer_to_move.parent(self.metadata()) != Some(parent) {
+						// TODO: Fix this so it works when dragging a layer into a group parent which has a Transform node, which used to work before #2689 caused this regression by removing the empty VectorData table row.
+						// TODO: See #2688 for this issue.
 						let layer_local_transform = self.network_interface.document_metadata().transform_to_viewport(layer_to_move);
 						let undo_transform = self.network_interface.document_metadata().transform_to_viewport(parent).inverse();
 						let transform = undo_transform * layer_local_transform;
+
 						responses.add(GraphOperationMessage::TransformSet {
 							layer: layer_to_move,
 							transform,
@@ -861,7 +864,7 @@ impl MessageHandler<DocumentMessage, DocumentMessageData<'_>> for DocumentMessag
 
 				responses.add(DocumentMessage::AddTransaction);
 
-				let layer = graph_modification_utils::new_image_layer(ImageFrameTable::new(image), layer_node_id, self.new_layer_parent(true), responses);
+				let layer = graph_modification_utils::new_image_layer(RasterDataTable::new(image), layer_node_id, self.new_layer_parent(true), responses);
 
 				if let Some(name) = name {
 					responses.add(NodeGraphMessage::SetDisplayName {
@@ -3234,6 +3237,8 @@ mod document_message_handler_tests {
 		assert_eq!(rect_grandparent, folder2, "Rectangle's grandparent should be folder2");
 	}
 
+	// TODO: Fix https://github.com/GraphiteEditor/Graphite/issues/2688 and reenable this as part of that fix.
+	#[ignore]
 	#[tokio::test]
 	async fn test_moving_layers_retains_transforms() {
 		let mut editor = EditorTestUtils::create();
@@ -3292,18 +3297,24 @@ mod document_message_handler_tests {
 		let document = editor.active_document();
 		let rect_bbox_before = document.metadata().bounding_box_viewport(rect_layer).unwrap();
 
-		// Moving rectangle from folder1 --> folder2
+		// Moving rectangle from folder1 to folder2
 		editor.handle_message(DocumentMessage::MoveSelectedLayersTo { parent: folder2, insert_index: 0 }).await;
 
 		// Rectangle's viewport position after moving
 		let document = editor.active_document();
 		let rect_bbox_after = document.metadata().bounding_box_viewport(rect_layer).unwrap();
 
 		// Verifing the rectangle maintains approximately the same position in viewport space
-		let before_center = (rect_bbox_before[0] + rect_bbox_before[1]) / 2.;
-		let after_center = (rect_bbox_after[0] + rect_bbox_after[1]) / 2.;
-		let distance = before_center.distance(after_center);
-
-		assert!(distance < 1., "Rectangle should maintain its viewport position after moving between transformed groups");
+		let before_center = (rect_bbox_before[0] + rect_bbox_before[1]) / 2.; // TODO: Should be: DVec2(0.0, -25.0), regression (#2688) causes it to be: DVec2(100.0, 25.0)
+		let after_center = (rect_bbox_after[0] + rect_bbox_after[1]) / 2.; // TODO:    Should be: DVec2(0.0, -25.0), regression (#2688) causes it to be: DVec2(200.0, 75.0)
+		let distance = before_center.distance(after_center); // TODO:                    Should be: 0.0,               regression (#2688) causes it to be: 111.80339887498948
+
+		assert!(
+			distance < 1.,
+			"Rectangle should maintain its viewport position after moving between transformed groups.\n\
+			Before: {before_center:?}\n\
+			After:  {after_center:?}\n\
+			Dist:   {distance} (should be < 1)"
+		);
 	}
 }