Move attach/alt-detach to their own functions

Author: williamchange

material_maker/panels/graph_edit/graph_edit.gd

@@ -249,47 +249,58 @@ func _gui_input(event) -> void:
 			if rect.has_point(get_global_mouse_position()):
 				mm_globals.set_tip_text("Space/#RMB: Nodes menu, Arrow keys: Pan, Mouse wheel: Zoom", 3)
 
-		# Detach node from connection (alt pressed while node is dragged)
-		if (event.alt_pressed and event.button_mask & MOUSE_BUTTON_MASK_LEFT != 0
-				and get_selected_nodes().size() and event.relative.length() > 0.0):
-			remove_with_reconnections(true)
-			target_drop_connection.clear()
-			target_drop_node = null
+		handle_node_detach(event)
+		handle_node_drop(event)
+
 
-		# Attach node to connection while node is dragged over a connection
-		if (get_selected_nodes().size() == 1
-				and event.button_mask & MOUSE_BUTTON_MASK_LEFT != 0
-				and event.relative.length() > 0.0):
-			hint_node_drop_allowed(not event.alt_pressed)
-			var node : GraphElement = get_selected_nodes()[0]
-			if node is not GraphNode:
+## Detaches node(s) from connections if alt is held down
+## while dragging a node.
+## [br][br]Unsets [param target_drop_connection] and [param target_drop_node]
+func handle_node_detach(event: InputEventMouseMotion) -> void:
+	if (event.alt_pressed and event.button_mask & MOUSE_BUTTON_MASK_LEFT != 0
+				and get_selected_nodes().size() and event.relative.length() > 0.0):
+		remove_with_reconnections(true)
+		target_drop_connection.clear()
+		target_drop_node = null
+
+
+## Checks whether a node can be dropped onto a connection (Alt key blocks the action)
+## and sets [param target_drop_connection] and [param target_drop_node]
+## [br][br]Node connections are performed by [method drop_node_on_connection] 
+func handle_node_drop(event: InputEventMouseMotion) -> void:
+	if (get_selected_nodes().size() == 1
+		and event.button_mask & MOUSE_BUTTON_MASK_LEFT != 0
+		and event.relative.length() > 0.0):
+		hint_node_drop_allowed(not event.alt_pressed)
+		var node : GraphElement = get_selected_nodes()[0]
+		if node is not GraphNode:
+			return
+		for c in get_connection_list():
+			if node.name in c.values():
 				return
-			for c in get_connection_list():
-				if node.name in c.values():
-					return
-			var active_conn : Dictionary
-			var node_rect : Rect2 = node.get_rect()
-			if node is MMGraphReroute:
-				node_rect.size.y = node_rect.size.x
-				node_rect.position.y += node_rect.size.y - 5.0
-			var conns := get_connections_intersecting_with_rect(node_rect)
-			if not conns.is_empty():
-				if conns.size() > 1:
-					conns.sort_custom(compare_connection_by_port_position_y)
-				active_conn = conns.front()
-				highlight_connection(active_conn)
-				if not event.alt_pressed:
-					target_drop_connection = active_conn
-					target_drop_node = node
-			else:
-				target_drop_connection.clear()
-				target_drop_node = null
-			for c in get_connection_list():
-				if c != active_conn:
-					highlight_connection(c, 0.0)
+		var active_conn : Dictionary
+		var node_rect : Rect2 = node.get_rect()
+		if node is MMGraphReroute:
+			node_rect.size.y = node_rect.size.x
+			node_rect.position.y += node_rect.size.y - 5.0
+		var conns := get_connections_intersecting_with_rect(node_rect)
+		if not conns.is_empty():
+			if conns.size() > 1:
+				conns.sort_custom(compare_connection_by_port_position_y)
+			active_conn = conns.front()
+			highlight_connection(active_conn)
+			if not event.alt_pressed:
+				target_drop_connection = active_conn
+				target_drop_node = node
 		else:
-			remove_theme_color_override("activity")
-			remove_theme_color_override("connection_hover_tint_color")
+			target_drop_connection.clear()
+			target_drop_node = null
+		for c in get_connection_list():
+			if c != active_conn:
+				highlight_connection(c, 0.0)
+	else:
+		remove_theme_color_override("activity")
+		remove_theme_color_override("connection_hover_tint_color")
 
 
 func compare_connection_by_port_position_y(a, b) -> bool:
@@ -888,6 +899,9 @@ func duplicate_selected() -> void:
 func duplicate_selected_with_inputs() -> void:
 	do_paste(serialize_selection([], true))
 
+
+## Detaches a node from an existing connection.
+## Nodes are kept if [param keep_nodes] is set
 func remove_with_reconnections(keep_nodes: bool = false) -> void:
 	var selection := get_selected_nodes()
 	var from_node : GraphNode