1 files changed, 37 insertions, 15 deletions

diff --git a/scene/resources/style_box.h b/scene/resources/style_box.h
index 64ce3528aa..cf8eed09c0 100644
--- a/scene/resources/style_box.h
+++ b/scene/resources/style_box.h
@@ -123,39 +123,61 @@ class StyleBoxFlat : public StyleBox {
 	GDCLASS(StyleBoxFlat, StyleBox);
 
 	Color bg_color;
-	Color light_color;
-	Color dark_color;
+	PoolVector<Color> border_color;
 
-	int border_size;
-	int additional_border_size[4];
+	int border_width[4];
+	int expand_margin[4];
+	int corner_radius[4];
 
-	bool draw_center;
-	bool blend;
+	bool filled;
+	bool blend_border;
+	int corner_detail;
 
 protected:
 	virtual float get_style_margin(Margin p_margin) const;
 	static void _bind_methods();
 
 public:
+	//Color
 	void set_bg_color(const Color &p_color);
-	void set_light_color(const Color &p_color);
-	void set_dark_color(const Color &p_color);
-
 	Color get_bg_color() const;
+
+	void set_light_color(const Color &p_color);
 	Color get_light_color() const;
+
+	void set_dark_color(const Color &p_color);
 	Color get_dark_color() const;
 
-	void set_border_size(int p_size);
-	int get_border_size() const;
+	//Border Color
+	void set_border_color_all(const Color &p_color);
+	void set_border_color(Margin p_border, const Color &p_color);
+	Color get_border_color(Margin p_border) const;
 
-	void _set_additional_border_size(Margin p_margin, int p_size);
-	int _get_additional_border_size(Margin p_margin) const;
+	//BORDER
+	//width
+	void set_border_width_all(int p_size);
+	int get_border_width_min() const;
 
+	void set_border_width(Margin p_margin, int p_size);
+	int get_border_width(Margin p_margin) const;
+
+	//blend
 	void set_border_blend(bool p_blend);
 	bool get_border_blend() const;
 
-	void set_draw_center(bool p_draw);
-	bool get_draw_center() const;
+	//CORNER_RADIUS
+	void set_corner_radius_all(int radius);
+	void set_corner_radius_individual(const int radius_top_left, const int radius_top_right, const int radius_botton_right, const int radius_bottom_left);
+	int get_corner_radius_min() const;
+
+	//EXPANDS
+	void set_expand_margin_size(Margin p_expand_margin, float p_size);
+	float get_expand_margin_size(Margin p_expand_margin) const;
+
+	//FILLED
+	void set_filled(bool p_draw);
+	bool is_filled() const;
+
 	virtual Size2 get_center_size() const;
 
 	virtual void draw(RID p_canvas_item, const Rect2 &p_rect) const;