GH-738 Fix Select Group to include Knots and Nodes

src/editor/graph/graph_edit.cpp

@@ -372,6 +372,23 @@ void OrchestratorGraphEdit::for_each_graph_node(std::function<void(OrchestratorG
     }
 }
 
+void OrchestratorGraphEdit::for_each_graph_element(const std::function<void(GraphElement*)>& p_func, bool p_nodes, bool p_knots)
+{
+    const int child_count = get_child_count();
+    for (int index = 0; index < child_count; index++)
+    {
+        GraphElement* element = Object::cast_to<GraphElement>(get_child(index));
+        if (!element)
+            continue;
+
+        const OrchestratorGraphNode* node = Object::cast_to<OrchestratorGraphNode>(element);
+        const OrchestratorGraphKnot* knot = Object::cast_to<OrchestratorGraphKnot>(element);
+
+        if ((p_nodes && node) || (p_knots && knot))
+            p_func(element);
+    }
+}
+
 void OrchestratorGraphEdit::execute_action(const String& p_action_name)
 {
     Ref<InputEventAction> action = memnew(InputEventAction);

src/editor/graph/graph_edit.h

@@ -209,6 +209,12 @@ class OrchestratorGraphEdit : public GraphEdit
     /// @param p_func the lambda to be applied
     void for_each_graph_node(std::function<void(OrchestratorGraphNode*)> p_func);
 
+    /// Perform an action for each <code>GraphNode</code> object type
+    /// @param p_func the function to call for each graph element
+    /// @param p_nodes whether <code>OrchestratorGraphNode</code> objects are included, defaults to <code>true</code>
+    /// @param p_knots whether <code>OrchestratorGraphKnot</code> objects are included, defaults to <code>true</code>
+    void for_each_graph_element(const std::function<void(GraphElement*)>& p_func, bool p_nodes = true, bool p_knots = true);
+
     /// Execute the specified action
     /// @param p_action_name the action to execute
     void execute_action(const String& p_action_name);

src/editor/graph/graph_node.cpp

@@ -618,12 +618,12 @@ void OrchestratorGraphNode::_add_option_pin()
         function_call_node->add_dynamic_pin();
 }
 
-List<OrchestratorGraphNode*> OrchestratorGraphNode::get_nodes_within_global_rect()
+List<GraphElement*> OrchestratorGraphNode::get_elements_within_global_rect()
 {
     Rect2 rect = get_global_rect();
 
-    List<OrchestratorGraphNode*> results;
-    _graph->for_each_graph_node([&](OrchestratorGraphNode* other) {
+    List<GraphElement*> results;
+    _graph->for_each_graph_element([&](GraphElement* other) {
         if (other && other != this)
         {
             Rect2 other_rect = other->get_global_rect();

src/editor/graph/graph_node.h

@@ -159,8 +159,8 @@ class OrchestratorGraphNode : public GraphNode
     /// Set whether node icons are shown
     virtual void show_icons(bool p_show_icons) { }
 
-    /// Get a list of nodes within this node's global rect.
-    List<OrchestratorGraphNode*> get_nodes_within_global_rect();
+    /// Get a list of elements within this node's global rect.
+    List<GraphElement*> get_elements_within_global_rect();
 
     /// Get the specified point index at the given position and direction
     /// @param p_position the position

src/editor/graph/nodes/graph_node_comment.cpp

@@ -121,8 +121,8 @@ void OrchestratorGraphNodeComment::_on_raise_request()
 
 bool OrchestratorGraphNodeComment::is_group_selected()
 {
-    List<OrchestratorGraphNode*> intersections = get_nodes_within_global_rect();
-    for (OrchestratorGraphNode* child : intersections)
+    List<GraphElement*> intersections = get_elements_within_global_rect();
+    for (GraphElement* child : intersections)
         if (!child->is_selected())
             return false;
     return true;
@@ -131,24 +131,24 @@ bool OrchestratorGraphNodeComment::is_group_selected()
 void OrchestratorGraphNodeComment::select_group()
 {
     // Select all child nodes
-    List<OrchestratorGraphNode*> intersections = get_nodes_within_global_rect();
-    for (OrchestratorGraphNode* child : intersections)
+    List<GraphElement*> intersections = get_elements_within_global_rect();
+    for (GraphElement* child : intersections)
         child->set_selected(true);
 }
 
 void OrchestratorGraphNodeComment::deselect_group()
 {
     // Deselects all child nodes
-    List<OrchestratorGraphNode*> intersections = get_nodes_within_global_rect();
-    for (OrchestratorGraphNode* child : intersections)
+    List<GraphElement*> intersections = get_elements_within_global_rect();
+    for (GraphElement* child : intersections)
         child->set_selected(false);
 }
 
 void OrchestratorGraphNodeComment::raise_request_node_reorder()
 {
     // This guarantees that any node that intersects with a comment node will be repositioned
     // in the scene after the comment, so that the rendering order appears correct.
-    List<OrchestratorGraphNode*> intersections = get_nodes_within_global_rect();
-    for (OrchestratorGraphNode* node : intersections)
+    List<GraphElement*> intersections = get_elements_within_global_rect();
+    for (GraphElement* node : intersections)
         get_parent()->move_child(node, -1);
 }