duplicate frame with nodes attached

Author: williamchange

addons/material_maker/engine/nodes/gen_comment.gd

@@ -11,6 +11,8 @@ var size : Vector2 = Vector2(350, 200)
 var title : String = "Comment"
 var autoshrink : bool = false
 
+var attached : PackedStringArray
+
 var color = null
 
 func _ready() -> void:
@@ -39,6 +41,7 @@ func _serialize(data : Dictionary) -> Dictionary:
 	data.text = text
 	data.size = { x=size.x, y=size.y }
 	data.autoshrink = MMType.serialize_value(autoshrink)
+	data.attached = attached
 	return data
 
 func _deserialize(data : Dictionary) -> void:
@@ -52,3 +55,5 @@ func _deserialize(data : Dictionary) -> void:
 		color = MMType.deserialize_value(data.color)
 	if data.has("autoshrink"):
 		autoshrink = MMType.deserialize_value(data.autoshrink)
+	if data.has("attached"):
+		attached = data.attached

material_maker/nodes/comment/comment.gd

@@ -273,4 +273,4 @@ func _on_resize_end(_new_size : Vector2) -> void:
 	is_resizing = false
 	redo_action = { type="resize_comment", node=generator.get_hier_name(), size=size }
 	get_parent().undoredo.add("Resize comment", [undo_action], [redo_action], true)
-	generator.size = size
+	generator.size = _new_size

material_maker/panels/graph_edit/graph_edit.gd

@@ -902,14 +902,34 @@ func do_paste(data) -> void:
 	var node_position = scroll_offset+0.5*size
 	if Rect2(Vector2(0, 0), size).has_point(get_local_mouse_position()):
 		node_position = offset_from_global_position(get_global_mouse_position())
+
+	# Mapping from original to duplicated node(names)
+	var dupe_map : Dictionary[String, String]
+
 	for c in get_children():
 		if c is GraphElement:
 			c.selected = false
+
+	var i := 0
+	for n in data.nodes.map(func(d): return d.name):
+		dupe_map["node_"+n] = ""
+
 	var new_nodes = await create_nodes(data, node_position)
 	if new_nodes != null:
 		for c in new_nodes:
 			c.selected = true
 
+			dupe_map[dupe_map.keys()[i]] = c.name
+			i += 1
+
+	# Attach duplicated nodes to frames
+	for old_node in dupe_map.keys():
+		if get_node(old_node) is MMGraphComment:
+			var new_frame = dupe_map[old_node]
+			for attached_node in get_attached_nodes_of_frame(old_node):
+				if dupe_map.has(attached_node):
+					attach_graph_element_to_frame(dupe_map[attached_node], new_frame)
+
 func paste() -> void:
 	var data : String = DisplayServer.clipboard_get().strip_edges()
 	var parsed_data = await mm_globals.parse_paste_data(data)
@@ -1764,3 +1784,6 @@ func detach_nodes() -> void:
 
 	for n in get_selected_nodes():
 		detach_graph_element_from_frame(n.name)
+
+func _on_frame_rect_changed(frame: GraphFrame, new_rect: Rect2) -> void:
+	frame.generator.size = new_rect.size

material_maker/panels/graph_edit/graph_edit.tscn

@@ -91,6 +91,7 @@ script = ExtResource("3")
 [connection signal="copy_nodes_request" from="." to="." method="copy"]
 [connection signal="disconnection_request" from="." to="." method="on_disconnect_node"]
 [connection signal="duplicate_nodes_request" from="." to="." method="duplicate_selected"]
+[connection signal="frame_rect_changed" from="." to="." method="_on_frame_rect_changed"]
 [connection signal="graph_elements_linked_to_frame_request" from="." to="." method="_on_graph_elements_linked_to_frame_request"]
 [connection signal="node_deselected" from="." to="." method="_on_GraphEdit_node_unselected"]
 [connection signal="node_selected" from="." to="." method="_on_GraphEdit_node_selected"]