1 files changed, 36 insertions, 19 deletions

diff --git a/scene/gui/graph_node.h b/scene/gui/graph_node.h
index 7eb5f27cff..e66b0cfc20 100644
--- a/scene/gui/graph_node.h
+++ b/scene/gui/graph_node.h
@@ -54,12 +54,12 @@ private:
 		Color color_right = Color(1, 1, 1, 1);
 		Ref<Texture2D> custom_slot_left;
 		Ref<Texture2D> custom_slot_right;
+		bool draw_stylebox = true;
 	};
 
 	String title;
 	Ref<TextLine> title_buf;
 
-	Dictionary opentype_features;
 	String language;
 	TextDirection text_direction = TEXT_DIRECTION_AUTO;
 
@@ -67,6 +67,8 @@ private:
 	Vector2 position_offset;
 	bool comment = false;
 	bool resizable = false;
+	bool draggable = true;
+	bool selectable = true;
 
 	bool resizing = false;
 	Vector2 resizing_from;
@@ -76,16 +78,19 @@ private:
 
 	Vector<int> cache_y;
 
-	struct ConnCache {
-		Vector2 pos;
+	struct PortCache {
+		Vector2 position;
+		int height;
+
+		int slot_idx;
 		int type = 0;
 		Color color;
 	};
 
-	Vector<ConnCache> conn_input_cache;
-	Vector<ConnCache> conn_output_cache;
+	Vector<PortCache> left_port_cache;
+	Vector<PortCache> right_port_cache;
 
-	Map<int, Slot> slot_info;
+	HashMap<int, Slot> slot_info;
 
 	bool connpos_dirty = true;
 
@@ -100,7 +105,6 @@ private:
 
 #ifdef TOOLS_ENABLED
 	void _edit_set_position(const Point2 &p_position) override;
-	void _validate_property(PropertyInfo &property) const override;
 #endif
 
 protected:
@@ -111,11 +115,12 @@ protected:
 	bool _set(const StringName &p_name, const Variant &p_value);
 	bool _get(const StringName &p_name, Variant &r_ret) const;
 	void _get_property_list(List<PropertyInfo> *p_list) const;
+	void _validate_property(PropertyInfo &p_property) const;
 
 public:
 	bool has_point(const Point2 &p_point) const override;
 
-	void set_slot(int p_idx, bool p_enable_left, int p_type_left, const Color &p_color_left, bool p_enable_right, int p_type_right, const Color &p_color_right, const Ref<Texture2D> &p_custom_left = Ref<Texture2D>(), const Ref<Texture2D> &p_custom_right = Ref<Texture2D>());
+	void set_slot(int p_idx, bool p_enable_left, int p_type_left, const Color &p_color_left, bool p_enable_right, int p_type_right, const Color &p_color_right, const Ref<Texture2D> &p_custom_left = Ref<Texture2D>(), const Ref<Texture2D> &p_custom_right = Ref<Texture2D>(), bool p_draw_stylebox = true);
 	void clear_slot(int p_idx);
 	void clear_all_slots();
 
@@ -137,16 +142,15 @@ public:
 	void set_slot_color_right(int p_idx, const Color &p_color_right);
 	Color get_slot_color_right(int p_idx) const;
 
+	bool is_slot_draw_stylebox(int p_idx) const;
+	void set_slot_draw_stylebox(int p_idx, bool p_enable);
+
 	void set_title(const String &p_title);
 	String get_title() const;
 
 	void set_text_direction(TextDirection p_text_direction);
 	TextDirection get_text_direction() const;
 
-	void set_opentype_feature(const String &p_name, int p_value);
-	int get_opentype_feature(const String &p_name) const;
-	void clear_opentype_features();
-
 	void set_language(const String &p_language);
 	String get_language() const;
 
@@ -163,13 +167,18 @@ public:
 	bool is_close_button_visible() const;
 
 	int get_connection_input_count();
+	int get_connection_input_height(int p_port);
+	Vector2 get_connection_input_position(int p_port);
+	int get_connection_input_type(int p_port);
+	Color get_connection_input_color(int p_port);
+	int get_connection_input_slot(int p_port);
+
 	int get_connection_output_count();
-	Vector2 get_connection_input_position(int p_idx);
-	int get_connection_input_type(int p_idx);
-	Color get_connection_input_color(int p_idx);
-	Vector2 get_connection_output_position(int p_idx);
-	int get_connection_output_type(int p_idx);
-	Color get_connection_output_color(int p_idx);
+	int get_connection_output_height(int p_port);
+	Vector2 get_connection_output_position(int p_port);
+	int get_connection_output_type(int p_port);
+	Color get_connection_output_color(int p_port);
+	int get_connection_output_slot(int p_port);
 
 	void set_overlay(Overlay p_overlay);
 	Overlay get_overlay() const;
@@ -180,12 +189,20 @@ public:
 	void set_resizable(bool p_enable);
 	bool is_resizable() const;
 
+	void set_draggable(bool p_draggable);
+	bool is_draggable();
+
+	void set_selectable(bool p_selectable);
+	bool is_selectable();
+
 	virtual Size2 get_minimum_size() const override;
 
 	virtual Vector<int> get_allowed_size_flags_horizontal() const override;
 	virtual Vector<int> get_allowed_size_flags_vertical() const override;
 
-	bool is_resizing() const { return resizing; }
+	bool is_resizing() const {
+		return resizing;
+	}
 
 	GraphNode();
 };