1 files changed, 28 insertions, 33 deletions

diff --git a/scene/resources/style_box.h b/scene/resources/style_box.h
index 5a80b4d4e2..91033617ab 100644
--- a/scene/resources/style_box.h
+++ b/scene/resources/style_box.h
@@ -41,36 +41,34 @@ class StyleBox : public Resource {
 	GDCLASS(StyleBox, Resource);
 	RES_BASE_EXTENSION("stylebox");
 	OBJ_SAVE_TYPE(StyleBox);
-	float margin[4];
+	float content_margin[4];
 
 protected:
-	virtual float get_style_margin(Side p_side) const;
+	virtual float get_style_margin(Side p_side) const { return 0; }
 	static void _bind_methods();
 
-	GDVIRTUAL1RC(float, _get_style_margin, Side)
-	GDVIRTUAL2RC(bool, _test_mask, Point2, Rect2)
-	GDVIRTUAL0RC(Size2, _get_center_size)
-	GDVIRTUAL1RC(Rect2, _get_draw_rect, Rect2)
 	GDVIRTUAL2C(_draw, RID, Rect2)
+	GDVIRTUAL1RC(Rect2, _get_draw_rect, Rect2)
+	GDVIRTUAL0RC(Size2, _get_minimum_size)
+	GDVIRTUAL2RC(bool, _test_mask, Point2, Rect2)
 
 public:
-	virtual bool test_mask(const Point2 &p_point, const Rect2 &p_rect) const;
+	virtual Size2 get_minimum_size() const;
 
-	void set_default_margin(Side p_side, float p_value);
-	void set_default_margin_all(float p_value);
-	void set_default_margin_individual(float p_left, float p_top, float p_right, float p_bottom);
-	float get_default_margin(Side p_side) const;
+	void set_content_margin(Side p_side, float p_value);
+	void set_content_margin_all(float p_value);
+	void set_content_margin_individual(float p_left, float p_top, float p_right, float p_bottom);
+	float get_content_margin(Side p_side) const;
 
 	float get_margin(Side p_side) const;
-	virtual Size2 get_center_size() const;
+	Point2 get_offset() const;
 
-	virtual Rect2 get_draw_rect(const Rect2 &p_rect) const;
 	virtual void draw(RID p_canvas_item, const Rect2 &p_rect) const;
+	virtual Rect2 get_draw_rect(const Rect2 &p_rect) const;
 
 	CanvasItem *get_current_item_drawn() const;
 
-	Size2 get_minimum_size() const;
-	Point2 get_offset() const;
+	virtual bool test_mask(const Point2 &p_point, const Rect2 &p_rect) const;
 
 	StyleBox();
 };
@@ -96,7 +94,7 @@ public:
 
 private:
 	float expand_margin[4] = {};
-	float margin[4] = {};
+	float texture_margin[4] = {};
 	Rect2 region_rect;
 	Ref<Texture2D> texture;
 	bool draw_center = true;
@@ -109,15 +107,17 @@ protected:
 	static void _bind_methods();
 
 public:
-	void set_expand_margin_size(Side p_expand_side, float p_size);
-	void set_expand_margin_size_all(float p_expand_margin_size);
-	void set_expand_margin_size_individual(float p_left, float p_top, float p_right, float p_bottom);
-	float get_expand_margin_size(Side p_expand_side) const;
+	virtual Size2 get_minimum_size() const override;
 
-	void set_margin_size(Side p_side, float p_size);
-	void set_margin_size_all(float p_size);
-	void set_margin_size_individual(float p_left, float p_top, float p_right, float p_bottom);
-	float get_margin_size(Side p_side) const;
+	void set_expand_margin(Side p_expand_side, float p_size);
+	void set_expand_margin_all(float p_expand_margin_size);
+	void set_expand_margin_individual(float p_left, float p_top, float p_right, float p_bottom);
+	float get_expand_margin(Side p_expand_side) const;
+
+	void set_texture_margin(Side p_side, float p_size);
+	void set_texture_margin_all(float p_size);
+	void set_texture_margin_individual(float p_left, float p_top, float p_right, float p_bottom);
+	float get_texture_margin(Side p_side) const;
 
 	void set_region_rect(const Rect2 &p_region_rect);
 	Rect2 get_region_rect() const;
@@ -127,7 +127,6 @@ public:
 
 	void set_draw_center(bool p_enabled);
 	bool is_draw_center_enabled() const;
-	virtual Size2 get_center_size() const override;
 
 	void set_h_axis_stretch_mode(AxisStretchMode p_mode);
 	AxisStretchMode get_h_axis_stretch_mode() const;
@@ -198,10 +197,10 @@ public:
 	void set_corner_detail(const int &p_corner_detail);
 	int get_corner_detail() const;
 
-	void set_expand_margin_size(Side p_expand_side, float p_size);
-	void set_expand_margin_size_all(float p_expand_margin_size);
-	void set_expand_margin_size_individual(float p_left, float p_top, float p_right, float p_bottom);
-	float get_expand_margin_size(Side p_expand_side) const;
+	void set_expand_margin(Side p_expand_side, float p_size);
+	void set_expand_margin_all(float p_expand_margin_size);
+	void set_expand_margin_individual(float p_left, float p_top, float p_right, float p_bottom);
+	float get_expand_margin(Side p_expand_side) const;
 
 	void set_draw_center(bool p_enabled);
 	bool is_draw_center_enabled() const;
@@ -223,8 +222,6 @@ public:
 	void set_aa_size(const real_t p_aa_size);
 	real_t get_aa_size() const;
 
-	virtual Size2 get_center_size() const override;
-
 	virtual Rect2 get_draw_rect(const Rect2 &p_rect) const override;
 	virtual void draw(RID p_canvas_item, const Rect2 &p_rect) const override;
 
@@ -261,8 +258,6 @@ public:
 	void set_grow_end(float p_grow);
 	float get_grow_end() const;
 
-	virtual Size2 get_center_size() const override;
-
 	virtual void draw(RID p_canvas_item, const Rect2 &p_rect) const override;
 
 	StyleBoxLine();