1 files changed, 105 insertions, 110 deletions

diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp
index a556514e0d..3efd465939 100644
--- a/scene/gui/graph_edit.cpp
+++ b/scene/gui/graph_edit.cpp
@@ -176,7 +176,7 @@ void GraphEditMinimap::gui_input(const Ref<InputEvent> &p_ev) {
 			new_minimap_size.y = MIN(get_size().y - mm->get_relative().y, ge->get_size().y - 2.0 * minimap_padding.y);
 			ge->set_minimap_size(new_minimap_size);
 
-			update();
+			queue_redraw();
 		} else {
 			Vector2 click_position = _convert_to_graph_position(mm->get_position() - minimap_padding) - graph_padding;
 			_adjust_graph_scroll(click_position);
@@ -201,10 +201,10 @@ Error GraphEdit::connect_node(const StringName &p_from, int p_from_port, const S
 	c.to_port = p_to_port;
 	c.activity = 0;
 	connections.push_back(c);
-	top_layer->update();
-	minimap->update();
-	update();
-	connections_layer->update();
+	top_layer->queue_redraw();
+	minimap->queue_redraw();
+	queue_redraw();
+	connections_layer->queue_redraw();
 
 	return OK;
 }
@@ -223,10 +223,10 @@ void GraphEdit::disconnect_node(const StringName &p_from, int p_from_port, const
 	for (const List<Connection>::Element *E = connections.front(); E; E = E->next()) {
 		if (E->get().from == p_from && E->get().from_port == p_from_port && E->get().to == p_to && E->get().to_port == p_to_port) {
 			connections.erase(E);
-			top_layer->update();
-			minimap->update();
-			update();
-			connections_layer->update();
+			top_layer->queue_redraw();
+			minimap->queue_redraw();
+			queue_redraw();
+			connections_layer->queue_redraw();
 			return;
 		}
 	}
@@ -253,9 +253,9 @@ void GraphEdit::_scroll_moved(double) {
 		call_deferred(SNAME("_update_scroll_offset"));
 		awaiting_scroll_offset_update = true;
 	}
-	top_layer->update();
-	minimap->update();
-	update();
+	top_layer->queue_redraw();
+	minimap->queue_redraw();
+	queue_redraw();
 
 	if (!setting_scroll_ofs) { //in godot, signals on change value are avoided as a convention
 		emit_signal(SNAME("scroll_offset_changed"), get_scroll_ofs());
@@ -353,25 +353,38 @@ void GraphEdit::_graph_node_raised(Node *p_gn) {
 	} else {
 		gn->raise();
 	}
-	emit_signal(SNAME("node_selected"), p_gn);
+}
+
+void GraphEdit::_graph_node_selected(Node *p_gn) {
+	GraphNode *gn = Object::cast_to<GraphNode>(p_gn);
+	ERR_FAIL_COND(!gn);
+
+	emit_signal(SNAME("node_selected"), gn);
+}
+
+void GraphEdit::_graph_node_deselected(Node *p_gn) {
+	GraphNode *gn = Object::cast_to<GraphNode>(p_gn);
+	ERR_FAIL_COND(!gn);
+
+	emit_signal(SNAME("node_deselected"), gn);
 }
 
 void GraphEdit::_graph_node_moved(Node *p_gn) {
 	GraphNode *gn = Object::cast_to<GraphNode>(p_gn);
 	ERR_FAIL_COND(!gn);
-	top_layer->update();
-	minimap->update();
-	update();
-	connections_layer->update();
+	top_layer->queue_redraw();
+	minimap->queue_redraw();
+	queue_redraw();
+	connections_layer->queue_redraw();
 }
 
 void GraphEdit::_graph_node_slot_updated(int p_index, Node *p_gn) {
 	GraphNode *gn = Object::cast_to<GraphNode>(p_gn);
 	ERR_FAIL_COND(!gn);
-	top_layer->update();
-	minimap->update();
-	update();
-	connections_layer->update();
+	top_layer->queue_redraw();
+	minimap->queue_redraw();
+	queue_redraw();
+	connections_layer->queue_redraw();
 }
 
 void GraphEdit::add_child_notify(Node *p_child) {
@@ -383,10 +396,12 @@ void GraphEdit::add_child_notify(Node *p_child) {
 	if (gn) {
 		gn->set_scale(Vector2(zoom, zoom));
 		gn->connect("position_offset_changed", callable_mp(this, &GraphEdit::_graph_node_moved).bind(gn));
+		gn->connect("selected", callable_mp(this, &GraphEdit::_graph_node_selected).bind(gn));
+		gn->connect("deselected", callable_mp(this, &GraphEdit::_graph_node_deselected).bind(gn));
 		gn->connect("slot_updated", callable_mp(this, &GraphEdit::_graph_node_slot_updated).bind(gn));
 		gn->connect("raise_request", callable_mp(this, &GraphEdit::_graph_node_raised).bind(gn));
-		gn->connect("item_rect_changed", callable_mp((CanvasItem *)connections_layer, &CanvasItem::update));
-		gn->connect("item_rect_changed", callable_mp((CanvasItem *)minimap, &GraphEditMinimap::update));
+		gn->connect("item_rect_changed", callable_mp((CanvasItem *)connections_layer, &CanvasItem::queue_redraw));
+		gn->connect("item_rect_changed", callable_mp((CanvasItem *)minimap, &GraphEditMinimap::queue_redraw));
 		_graph_node_moved(gn);
 		gn->set_mouse_filter(MOUSE_FILTER_PASS);
 	}
@@ -409,21 +424,24 @@ void GraphEdit::remove_child_notify(Node *p_child) {
 	GraphNode *gn = Object::cast_to<GraphNode>(p_child);
 	if (gn) {
 		gn->disconnect("position_offset_changed", callable_mp(this, &GraphEdit::_graph_node_moved));
+		gn->disconnect("selected", callable_mp(this, &GraphEdit::_graph_node_selected));
+		gn->disconnect("deselected", callable_mp(this, &GraphEdit::_graph_node_deselected));
 		gn->disconnect("slot_updated", callable_mp(this, &GraphEdit::_graph_node_slot_updated));
 		gn->disconnect("raise_request", callable_mp(this, &GraphEdit::_graph_node_raised));
 
 		// In case of the whole GraphEdit being destroyed these references can already be freed.
 		if (connections_layer != nullptr && connections_layer->is_inside_tree()) {
-			gn->disconnect("item_rect_changed", callable_mp((CanvasItem *)connections_layer, &CanvasItem::update));
+			gn->disconnect("item_rect_changed", callable_mp((CanvasItem *)connections_layer, &CanvasItem::queue_redraw));
 		}
 		if (minimap != nullptr && minimap->is_inside_tree()) {
-			gn->disconnect("item_rect_changed", callable_mp((CanvasItem *)minimap, &GraphEditMinimap::update));
+			gn->disconnect("item_rect_changed", callable_mp((CanvasItem *)minimap, &GraphEditMinimap::queue_redraw));
 		}
 	}
 }
 
 void GraphEdit::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ENTER_TREE:
 		case NOTIFICATION_THEME_CHANGED: {
 			port_hotzone_inner_extent = get_theme_constant("port_hotzone_inner_extent");
 			port_hotzone_outer_extent = get_theme_constant("port_hotzone_outer_extent");
@@ -499,8 +517,8 @@ void GraphEdit::_notification(int p_what) {
 
 		case NOTIFICATION_RESIZED: {
 			_update_scroll();
-			top_layer->update();
-			minimap->update();
+			top_layer->queue_redraw();
+			minimap->queue_redraw();
 		} break;
 	}
 }
@@ -697,8 +715,8 @@ void GraphEdit::_top_layer_input(const Ref<InputEvent> &p_ev) {
 	if (mm.is_valid() && connecting) {
 		connecting_to = mm->get_position();
 		connecting_target = false;
-		top_layer->update();
-		minimap->update();
+		top_layer->queue_redraw();
+		minimap->queue_redraw();
 		connecting_valid = just_disconnected || click_pos.distance_to(connecting_to / zoom) > 20.0;
 
 		if (connecting_valid) {
@@ -1169,29 +1187,14 @@ void GraphEdit::gui_input(const Ref<InputEvent> &p_ev) {
 			bool in_box = r.intersects(box_selecting_rect);
 
 			if (in_box) {
-				if (!gn->is_selected() && box_selection_mode_additive) {
-					emit_signal(SNAME("node_selected"), gn);
-				} else if (gn->is_selected() && !box_selection_mode_additive) {
-					emit_signal(SNAME("node_deselected"), gn);
-				}
-				if (gn->is_selectable()) {
-					gn->set_selected(box_selection_mode_additive);
-				}
+				gn->set_selected(box_selection_mode_additive);
 			} else {
-				bool select = (previous_selected.find(gn) != nullptr);
-				if (gn->is_selected() && !select) {
-					emit_signal(SNAME("node_deselected"), gn);
-				} else if (!gn->is_selected() && select) {
-					emit_signal(SNAME("node_selected"), gn);
-				}
-				if (gn->is_selectable()) {
-					gn->set_selected(select);
-				}
+				gn->set_selected(previous_selected.find(gn) != nullptr);
 			}
 		}
 
-		top_layer->update();
-		minimap->update();
+		top_layer->queue_redraw();
+		minimap->queue_redraw();
 	}
 
 	Ref<InputEventMouseButton> b = p_ev;
@@ -1205,16 +1208,10 @@ void GraphEdit::gui_input(const Ref<InputEvent> &p_ev) {
 						continue;
 					}
 
-					bool select = (gn->is_selectable() && previous_selected.find(gn) != nullptr);
-					if (gn->is_selected() && !select) {
-						emit_signal(SNAME("node_deselected"), gn);
-					} else if (!gn->is_selected() && select) {
-						emit_signal(SNAME("node_selected"), gn);
-					}
-					gn->set_selected(select);
+					gn->set_selected(previous_selected.find(gn) != nullptr);
 				}
-				top_layer->update();
-				minimap->update();
+				top_layer->queue_redraw();
+				minimap->queue_redraw();
 			} else {
 				if (connecting) {
 					force_connection_drag_end();
@@ -1234,7 +1231,6 @@ void GraphEdit::gui_input(const Ref<InputEvent> &p_ev) {
 						Rect2 r = gn->get_rect();
 						r.size *= zoom;
 						if (r.has_point(b->get_position())) {
-							emit_signal(SNAME("node_deselected"), gn);
 							gn->set_selected(false);
 						}
 					}
@@ -1260,27 +1256,30 @@ void GraphEdit::gui_input(const Ref<InputEvent> &p_ev) {
 
 			dragging = false;
 
-			top_layer->update();
-			minimap->update();
-			update();
-			connections_layer->update();
+			top_layer->queue_redraw();
+			minimap->queue_redraw();
+			queue_redraw();
+			connections_layer->queue_redraw();
 		}
 
 		if (b->get_button_index() == MouseButton::LEFT && b->is_pressed()) {
 			GraphNode *gn = nullptr;
 
+			// Find node which was clicked on.
 			for (int i = get_child_count() - 1; i >= 0; i--) {
 				GraphNode *gn_selected = Object::cast_to<GraphNode>(get_child(i));
 
-				if (gn_selected) {
-					if (gn_selected->is_resizing()) {
-						continue;
-					}
+				if (!gn_selected) {
+					continue;
+				}
 
-					if (gn_selected->has_point((b->get_position() - gn_selected->get_position()) / zoom)) {
-						gn = gn_selected;
-						break;
-					}
+				if (gn_selected->is_resizing()) {
+					continue;
+				}
+
+				if (gn_selected->has_point((b->get_position() - gn_selected->get_position()) / zoom)) {
+					gn = gn_selected;
+					break;
 				}
 			}
 
@@ -1289,26 +1288,22 @@ void GraphEdit::gui_input(const Ref<InputEvent> &p_ev) {
 					return;
 				}
 
+				// Left-clicked on a node, select it.
 				dragging = true;
 				drag_accum = Vector2();
 				just_selected = !gn->is_selected();
 				if (!gn->is_selected() && !Input::get_singleton()->is_key_pressed(Key::CTRL)) {
 					for (int i = 0; i < get_child_count(); i++) {
 						GraphNode *o_gn = Object::cast_to<GraphNode>(get_child(i));
-						if (o_gn) {
-							if (o_gn == gn) {
-								o_gn->set_selected(o_gn->is_selectable());
-							} else {
-								if (o_gn->is_selected()) {
-									emit_signal(SNAME("node_deselected"), o_gn);
-								}
-								o_gn->set_selected(false);
-							}
+						if (!o_gn) {
+							continue;
 						}
+
+						o_gn->set_selected(o_gn == gn);
 					}
 				}
 
-				gn->set_selected(gn->is_selectable());
+				gn->set_selected(true);
 				for (int i = 0; i < get_child_count(); i++) {
 					GraphNode *o_gn = Object::cast_to<GraphNode>(get_child(i));
 					if (!o_gn) {
@@ -1331,6 +1326,7 @@ void GraphEdit::gui_input(const Ref<InputEvent> &p_ev) {
 					return;
 				}
 
+				// Left-clicked on empty space, start box select.
 				box_selecting = true;
 				box_selecting_from = b->get_position();
 				if (b->is_ctrl_pressed()) {
@@ -1363,9 +1359,7 @@ void GraphEdit::gui_input(const Ref<InputEvent> &p_ev) {
 						if (!gn2) {
 							continue;
 						}
-						if (gn2->is_selected()) {
-							emit_signal(SNAME("node_deselected"), gn2);
-						}
+
 						gn2->set_selected(false);
 					}
 				}
@@ -1373,11 +1367,12 @@ void GraphEdit::gui_input(const Ref<InputEvent> &p_ev) {
 		}
 
 		if (b->get_button_index() == MouseButton::LEFT && !b->is_pressed() && box_selecting) {
+			// Box selection ended. Nodes were selected during mouse movement.
 			box_selecting = false;
 			box_selecting_rect = Rect2();
 			previous_selected.clear();
-			top_layer->update();
-			minimap->update();
+			top_layer->queue_redraw();
+			minimap->queue_redraw();
 		}
 	}
 
@@ -1443,9 +1438,9 @@ void GraphEdit::set_connection_activity(const StringName &p_from, int p_from_por
 		if (E.from == p_from && E.from_port == p_from_port && E.to == p_to && E.to_port == p_to_port) {
 			if (Math::is_equal_approx(E.activity, p_activity)) {
 				//update only if changed
-				top_layer->update();
-				minimap->update();
-				connections_layer->update();
+				top_layer->queue_redraw();
+				minimap->queue_redraw();
+				connections_layer->queue_redraw();
 			}
 			E.activity = p_activity;
 			return;
@@ -1455,19 +1450,19 @@ void GraphEdit::set_connection_activity(const StringName &p_from, int p_from_por
 
 void GraphEdit::clear_connections() {
 	connections.clear();
-	minimap->update();
-	update();
-	connections_layer->update();
+	minimap->queue_redraw();
+	queue_redraw();
+	connections_layer->queue_redraw();
 }
 
 void GraphEdit::force_connection_drag_end() {
 	ERR_FAIL_COND_MSG(!connecting, "Drag end requested without active drag!");
 	connecting = false;
 	connecting_valid = false;
-	top_layer->update();
-	minimap->update();
-	update();
-	connections_layer->update();
+	top_layer->queue_redraw();
+	minimap->queue_redraw();
+	queue_redraw();
+	connections_layer->queue_redraw();
 	emit_signal(SNAME("connection_drag_ended"));
 }
 
@@ -1501,14 +1496,14 @@ void GraphEdit::set_zoom_custom(float p_zoom, const Vector2 &p_center) {
 	Vector2 sbofs = (Vector2(h_scroll->get_value(), v_scroll->get_value()) + p_center) / zoom;
 
 	zoom = p_zoom;
-	top_layer->update();
+	top_layer->queue_redraw();
 
 	zoom_minus->set_disabled(zoom == zoom_min);
 	zoom_plus->set_disabled(zoom == zoom_max);
 
 	_update_scroll();
-	minimap->update();
-	connections_layer->update();
+	minimap->queue_redraw();
+	connections_layer->queue_redraw();
 
 	if (is_visible_in_tree()) {
 		Vector2 ofs = sbofs * zoom - p_center;
@@ -1517,7 +1512,7 @@ void GraphEdit::set_zoom_custom(float p_zoom, const Vector2 &p_center) {
 	}
 
 	_update_zoom_label();
-	update();
+	queue_redraw();
 }
 
 float GraphEdit::get_zoom() const {
@@ -1656,7 +1651,7 @@ void GraphEdit::set_use_snap(bool p_enable) {
 		return;
 	}
 	snap_button->set_pressed(p_enable);
-	update();
+	queue_redraw();
 }
 
 bool GraphEdit::is_using_snap() const {
@@ -1670,15 +1665,15 @@ int GraphEdit::get_snap() const {
 void GraphEdit::set_snap(int p_snap) {
 	ERR_FAIL_COND(p_snap < 5);
 	snap_amount->set_value(p_snap);
-	update();
+	queue_redraw();
 }
 
 void GraphEdit::_snap_toggled() {
-	update();
+	queue_redraw();
 }
 
 void GraphEdit::_snap_value_changed(double) {
-	update();
+	queue_redraw();
 }
 
 void GraphEdit::set_minimap_size(Vector2 p_size) {
@@ -1690,7 +1685,7 @@ void GraphEdit::set_minimap_size(Vector2 p_size) {
 	minimap->set_offset(Side::SIDE_TOP, -minimap_size.y - MINIMAP_OFFSET);
 	minimap->set_offset(Side::SIDE_RIGHT, -MINIMAP_OFFSET);
 	minimap->set_offset(Side::SIDE_BOTTOM, -MINIMAP_OFFSET);
-	minimap->update();
+	minimap->queue_redraw();
 }
 
 Vector2 GraphEdit::get_minimap_size() const {
@@ -1702,7 +1697,7 @@ void GraphEdit::set_minimap_opacity(float p_opacity) {
 		return;
 	}
 	minimap->set_modulate(Color(1, 1, 1, p_opacity));
-	minimap->update();
+	minimap->queue_redraw();
 }
 
 float GraphEdit::get_minimap_opacity() const {
@@ -1716,7 +1711,7 @@ void GraphEdit::set_minimap_enabled(bool p_enable) {
 	}
 	minimap_button->set_pressed(p_enable);
 	_minimap_toggled();
-	minimap->update();
+	minimap->queue_redraw();
 }
 
 bool GraphEdit::is_minimap_enabled() const {
@@ -1739,7 +1734,7 @@ bool GraphEdit::is_arrange_nodes_button_hidden() const {
 void GraphEdit::_minimap_toggled() {
 	if (is_minimap_enabled()) {
 		minimap->set_visible(true);
-		minimap->update();
+		minimap->queue_redraw();
 	} else {
 		minimap->set_visible(false);
 	}
@@ -1747,7 +1742,7 @@ void GraphEdit::_minimap_toggled() {
 
 void GraphEdit::set_connection_lines_curvature(float p_curvature) {
 	lines_curvature = p_curvature;
-	update();
+	queue_redraw();
 }
 
 float GraphEdit::get_connection_lines_curvature() const {
@@ -1759,7 +1754,7 @@ void GraphEdit::set_connection_lines_thickness(float p_thickness) {
 		return;
 	}
 	lines_thickness = p_thickness;
-	update();
+	queue_redraw();
 }
 
 float GraphEdit::get_connection_lines_thickness() const {
@@ -1771,7 +1766,7 @@ void GraphEdit::set_connection_lines_antialiased(bool p_antialiased) {
 		return;
 	}
 	lines_antialiased = p_antialiased;
-	update();
+	queue_redraw();
 }
 
 bool GraphEdit::is_connection_lines_antialiased() const {