1 files changed, 24 insertions, 24 deletions

diff --git a/scene/gui/scroll_bar.h b/scene/gui/scroll_bar.h
index ee5e7140cf..574d17ee20 100644
--- a/scene/gui/scroll_bar.h
+++ b/scene/gui/scroll_bar.h
@@ -5,8 +5,8 @@
 /*                           GODOT ENGINE                                */
 /*                      https://godotengine.org                          */
 /*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).   */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -34,7 +34,6 @@
 #include "scene/gui/range.h"
 
 class ScrollBar : public Range {
-
 	GDCLASS(ScrollBar, Range);
 
 	enum HighlightStatus {
@@ -48,47 +47,49 @@ class ScrollBar : public Range {
 
 	Orientation orientation;
 	Size2 size;
-	float custom_step;
+	float custom_step = -1.0;
 
-	HighlightStatus highlight;
+	HighlightStatus highlight = HIGHLIGHT_NONE;
 
-	struct Drag {
+	bool incr_active = false;
+	bool decr_active = false;
 
-		bool active;
-		float pos_at_click;
-		float value_at_click;
+	struct Drag {
+		bool active = false;
+		float pos_at_click = 0.0;
+		float value_at_click = 0.0;
 	} drag;
 
 	double get_grabber_size() const;
 	double get_grabber_min_size() const;
 	double get_area_size() const;
 	double get_area_offset() const;
-	double get_click_pos(const Point2 &p_pos) const;
 	double get_grabber_offset() const;
 
 	static void set_can_focus_by_default(bool p_can_focus);
 
-	Node *drag_node;
+	Node *drag_node = nullptr;
 	NodePath drag_node_path;
+	bool drag_node_enabled = true;
 
-	Vector2 drag_node_speed;
+	Vector2 drag_node_speed = Vector2();
 	Vector2 drag_node_accum;
 	Vector2 drag_node_from;
 	Vector2 last_drag_node_accum;
-	float last_drag_node_time;
-	float time_since_motion;
-	bool drag_node_touching;
-	bool drag_node_touching_deaccel;
-	bool click_handled;
+	float last_drag_node_time = 0.0;
+	float time_since_motion = 0.0;
+	bool drag_node_touching = false;
+	bool drag_node_touching_deaccel = false;
+	bool click_handled = false;
 
-	bool scrolling;
-	double target_scroll;
-	bool smooth_scroll_enabled;
+	bool scrolling = false;
+	double target_scroll = 0.0;
+	bool smooth_scroll_enabled = false;
 
 	void _drag_node_exit();
 	void _drag_node_input(const Ref<InputEvent> &p_input);
 
-	void _gui_input(Ref<InputEvent> p_event);
+	virtual void gui_input(const Ref<InputEvent> &p_event) override;
 
 protected:
 	void _notification(int p_what);
@@ -101,17 +102,17 @@ public:
 
 	void set_drag_node(const NodePath &p_path);
 	NodePath get_drag_node() const;
+	void set_drag_node_enabled(bool p_enable);
 
 	void set_smooth_scroll_enabled(bool p_enable);
 	bool is_smooth_scroll_enabled() const;
 
-	virtual Size2 get_minimum_size() const;
+	virtual Size2 get_minimum_size() const override;
 	ScrollBar(Orientation p_orientation = VERTICAL);
 	~ScrollBar();
 };
 
 class HScrollBar : public ScrollBar {
-
 	GDCLASS(HScrollBar, ScrollBar);
 
 public:
@@ -120,7 +121,6 @@ public:
 };
 
 class VScrollBar : public ScrollBar {
-
 	GDCLASS(VScrollBar, ScrollBar);
 
 public: