1 files changed, 29 insertions, 30 deletions

diff --git a/scene/gui/control.h b/scene/gui/control.h
index 8496729f05..2241c242bb 100644
--- a/scene/gui/control.h
+++ b/scene/gui/control.h
@@ -166,48 +166,48 @@ private:
 		Point2 pos_cache;
 		Size2 size_cache;
 		Size2 minimum_size_cache;
-		bool minimum_size_valid;
+		bool minimum_size_valid = false;
 
 		Size2 last_minimum_size;
-		bool updating_last_minimum_size;
+		bool updating_last_minimum_size = false;
 
-		float margin[4];
-		float anchor[4];
-		FocusMode focus_mode;
-		GrowDirection h_grow;
-		GrowDirection v_grow;
+		float margin[4] = { 0.0, 0.0, 0.0, 0.0 };
+		float anchor[4] = { ANCHOR_BEGIN, ANCHOR_BEGIN, ANCHOR_BEGIN, ANCHOR_BEGIN };
+		FocusMode focus_mode = FOCUS_NONE;
+		GrowDirection h_grow = GROW_DIRECTION_END;
+		GrowDirection v_grow = GROW_DIRECTION_END;
 
-		LayoutDirection layout_dir;
+		LayoutDirection layout_dir = LAYOUT_DIRECTION_INHERITED;
 
-		float rotation;
-		Vector2 scale;
+		float rotation = 0;
+		Vector2 scale = Vector2(1, 1);
 		Vector2 pivot_offset;
 
-		int h_size_flags;
-		int v_size_flags;
-		float expand;
+		int h_size_flags = SIZE_FILL;
+		int v_size_flags = SIZE_FILL;
+		float expand = 1;
 		Point2 custom_minimum_size;
 
-		MouseFilter mouse_filter;
+		MouseFilter mouse_filter = MOUSE_FILTER_STOP;
 
-		bool clip_contents;
+		bool clip_contents = false;
 
-		bool block_minimum_size_adjust;
-		bool disable_visibility_clip;
+		bool block_minimum_size_adjust = false;
+		bool disable_visibility_clip = false;
 
-		Control *parent;
+		Control *parent = nullptr;
 		ObjectID drag_owner;
 		Ref<Theme> theme;
-		Control *theme_owner;
-		Window *theme_owner_window;
+		Control *theme_owner = nullptr;
+		Window *theme_owner_window = nullptr;
 		String tooltip;
-		CursorShape default_cursor;
+		CursorShape default_cursor = CURSOR_ARROW;
 
-		List<Control *>::Element *RI;
+		List<Control *>::Element *RI = nullptr;
 
-		CanvasItem *parent_canvas_item;
+		CanvasItem *parent_canvas_item = nullptr;
 
-		NodePath focus_neighbour[4];
+		NodePath focus_neighbor[4];
 		NodePath focus_next;
 		NodePath focus_prev;
 
@@ -223,8 +223,8 @@ private:
 	// used internally
 	Control *_find_control_at_pos(CanvasItem *p_node, const Point2 &p_pos, const Transform2D &p_xform, Transform2D &r_inv_xform);
 
-	void _window_find_focus_neighbour(const Vector2 &p_dir, Node *p_at, const Point2 *p_points, float p_min, float &r_closest_dist, Control **r_closest);
-	Control *_get_focus_neighbour(Margin p_margin, int p_count = 0);
+	void _window_find_focus_neighbor(const Vector2 &p_dir, Node *p_at, const Point2 *p_points, float p_min, float &r_closest_dist, Control **r_closest);
+	Control *_get_focus_neighbor(Margin p_margin, int p_count = 0);
 
 	void _set_anchor(Margin p_margin, float p_anchor);
 	void _set_position(const Point2 &p_point);
@@ -436,8 +436,8 @@ public:
 	Control *find_next_valid_focus() const;
 	Control *find_prev_valid_focus() const;
 
-	void set_focus_neighbour(Margin p_margin, const NodePath &p_neighbour);
-	NodePath get_focus_neighbour(Margin p_margin) const;
+	void set_focus_neighbor(Margin p_margin, const NodePath &p_neighbor);
+	NodePath get_focus_neighbor(Margin p_margin) const;
 
 	void set_focus_next(const NodePath &p_next);
 	NodePath get_focus_next() const;
@@ -518,8 +518,7 @@ public:
 	virtual void get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const override;
 	virtual String get_configuration_warning() const override;
 
-	Control();
-	~Control();
+	Control() {}
 };
 
 VARIANT_ENUM_CAST(Control::FocusMode);