1 files changed, 22 insertions, 16 deletions

diff --git a/scene/gui/scroll_container.h b/scene/gui/scroll_container.h
index 7e32cbed1c..f61df70b85 100644
--- a/scene/gui/scroll_container.h
+++ b/scene/gui/scroll_container.h
@@ -42,7 +42,6 @@ class ScrollContainer : public Container {
 	VScrollBar *v_scroll;
 
 	Size2 child_max_size;
-	Size2 scroll;
 
 	void update_scrollbars();
 
@@ -50,18 +49,19 @@ class ScrollContainer : public Container {
 	Vector2 drag_accum;
 	Vector2 drag_from;
 	Vector2 last_drag_accum;
-	float last_drag_time;
-	float time_since_motion;
-	bool drag_touching;
-	bool drag_touching_deaccel;
-	bool click_handled;
-	bool beyond_deadzone;
+	float time_since_motion = 0.0f;
+	bool drag_touching = false;
+	bool drag_touching_deaccel = false;
+	bool beyond_deadzone = false;
 
-	bool scroll_h;
-	bool scroll_v;
+	bool scroll_h = true;
+	bool scroll_v = true;
 
-	int deadzone;
-	bool follow_focus;
+	bool h_scroll_visible = true;
+	bool v_scroll_visible = true;
+
+	int deadzone = 0;
+	bool follow_focus = false;
 
 	void _cancel_drag();
 
@@ -80,11 +80,11 @@ protected:
 	void _ensure_focused_visible(Control *p_node);
 
 public:
-	int get_v_scroll() const;
-	void set_v_scroll(int p_pos);
-
-	int get_h_scroll() const;
 	void set_h_scroll(int p_pos);
+	int get_h_scroll() const;
+
+	void set_v_scroll(int p_pos);
+	int get_v_scroll() const;
 
 	void set_enable_h_scroll(bool p_enable);
 	bool is_h_scroll_enabled() const;
@@ -92,6 +92,12 @@ public:
 	void set_enable_v_scroll(bool p_enable);
 	bool is_v_scroll_enabled() const;
 
+	void set_h_scroll_visible(bool p_visible);
+	bool is_h_scroll_visible() const;
+
+	void set_v_scroll_visible(bool p_visible);
+	bool is_v_scroll_visible() const;
+
 	int get_deadzone() const;
 	void set_deadzone(int p_deadzone);
 
@@ -103,7 +109,7 @@ public:
 
 	virtual bool clips_input() const override;
 
-	virtual String get_configuration_warning() const override;
+	TypedArray<String> get_configuration_warnings() const override;
 
 	ScrollContainer();
 };