1 files changed, 42 insertions, 9 deletions

diff --git a/scene/gui/split_container.h b/scene/gui/split_container.h
index a69ffe4de9..d297e3a3ea 100644
--- a/scene/gui/split_container.h
+++ b/scene/gui/split_container.h
@@ -33,8 +33,26 @@
 
 #include "scene/gui/container.h"
 
+class SplitContainerDragger : public Control {
+	GDCLASS(SplitContainerDragger, Control);
+
+protected:
+	void _notification(int p_what);
+	virtual void gui_input(const Ref<InputEvent> &p_event) override;
+
+private:
+	bool dragging = false;
+	int drag_from = 0;
+	int drag_ofs = 0;
+	bool mouse_inside = false;
+
+public:
+	virtual CursorShape get_cursor_shape(const Point2 &p_pos = Point2i()) const override;
+};
+
 class SplitContainer : public Container {
 	GDCLASS(SplitContainer, Container);
+	friend class SplitContainerDragger;
 
 public:
 	enum DraggerVisibility {
@@ -44,24 +62,38 @@ public:
 	};
 
 private:
-	bool should_clamp_split_offset = false;
 	int split_offset = 0;
 	int middle_sep = 0;
 	bool vertical = false;
-	bool dragging = false;
-	int drag_from = 0;
-	int drag_ofs = 0;
 	bool collapsed = false;
 	DraggerVisibility dragger_visibility = DRAGGER_VISIBLE;
-	bool mouse_inside = false;
+
+	SplitContainerDragger *dragging_area_control = nullptr;
+
+	struct ThemeCache {
+		int separation = 0;
+		int minimum_grab_thickness = 0;
+		int autohide = 0;
+		Ref<Texture2D> grabber_icon;
+		Ref<Texture2D> grabber_icon_h;
+		Ref<Texture2D> grabber_icon_v;
+	} theme_cache;
 
 	Control *_getch(int p_idx) const;
 
+	Ref<Texture2D> _get_grabber_icon() const;
+	void _compute_middle_sep(bool p_clamp);
 	void _resort();
 
+	void _dragging_area_gui_input(const Ref<InputEvent> &p_event);
+
 protected:
-	virtual void gui_input(const Ref<InputEvent> &p_event) override;
+	bool is_fixed = false;
+
+	virtual void _update_theme_item_cache() override;
+
 	void _notification(int p_what);
+	void _validate_property(PropertyInfo &p_property) const;
 	static void _bind_methods();
 
 public:
@@ -75,7 +107,8 @@ public:
 	void set_dragger_visibility(DraggerVisibility p_visibility);
 	DraggerVisibility get_dragger_visibility() const;
 
-	virtual CursorShape get_cursor_shape(const Point2 &p_pos = Point2i()) const override;
+	void set_vertical(bool p_vertical);
+	bool is_vertical() const;
 
 	virtual Size2 get_minimum_size() const override;
 
@@ -92,7 +125,7 @@ class HSplitContainer : public SplitContainer {
 
 public:
 	HSplitContainer() :
-			SplitContainer(false) {}
+			SplitContainer(false) { is_fixed = true; }
 };
 
 class VSplitContainer : public SplitContainer {
@@ -100,7 +133,7 @@ class VSplitContainer : public SplitContainer {
 
 public:
 	VSplitContainer() :
-			SplitContainer(true) {}
+			SplitContainer(true) { is_fixed = true; }
 };
 
 #endif // SPLIT_CONTAINER_H