Merge pull request #10816 from toger5/style_box_texture_set_fill

unified draw_center naming for (9patch,StyleBoxes)

doc/base/classes.xml

@@ -25989,7 +25989,7 @@
 	<description>
 	</description>
 	<methods>
-		<method name="get_draw_center" qualifiers="const">
+		<method name="is_draw_center_enabled" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
@@ -26071,7 +26071,7 @@
 		</member>
 		<member name="axis_stretch_vertical" type="int" setter="set_v_axis_stretch_mode" getter="get_v_axis_stretch_mode" brief="">
 		</member>
-		<member name="draw_center" type="bool" setter="set_draw_center" getter="get_draw_center" brief="">
+		<member name="draw_center" type="bool" setter="set_draw_center" getter="is_draw_center_enabled" brief="">
 		</member>
 		<member name="patch_margin_bottom" type="int" setter="set_patch_margin" getter="get_patch_margin" brief="">
 		</member>
@@ -44515,7 +44515,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="get_draw_center" qualifiers="const">
+		<method name="is_draw_center_enabled" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
@@ -44573,7 +44573,7 @@
 		</member>
 		<member name="dark_color" type="Color" setter="set_dark_color" getter="get_dark_color" brief="">
 		</member>
-		<member name="draw_bg" type="bool" setter="set_draw_center" getter="get_draw_center" brief="">
+		<member name="draw_bg" type="bool" setter="set_draw_center" getter="is_draw_center_enabled" brief="">
 		</member>
 		<member name="light_color" type="Color" setter="set_light_color" getter="get_light_color" brief="">
 		</member>
@@ -44589,7 +44589,7 @@
 		Texture Based 3x3 scale style. This stylebox performs a 3x3 scaling of a texture, where only the center cell is fully stretched. This allows for the easy creation of bordered styles.
 	</description>
 	<methods>
-		<method name="get_draw_center" qualifiers="const">
+		<method name="is_draw_center_enabled" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
@@ -44683,7 +44683,7 @@
 		</method>
 	</methods>
 	<members>
-		<member name="draw_center" type="bool" setter="set_draw_center" getter="get_draw_center" brief="">
+		<member name="draw_center" type="bool" setter="set_draw_center" getter="is_draw_center_enabled" brief="">
 		</member>
 		<member name="expand_margin_bottom" type="float" setter="set_expand_margin_size" getter="get_expand_margin_size" brief="">
 		</member>

editor/editor_themes.cpp

@@ -284,7 +284,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
 
 	// Focus
 	Ref<StyleBoxFlat> focus_sbt = make_flat_stylebox(contrast_color_1, 4, 4, 4, 4);
-	focus_sbt->set_filled(false);
+	focus_sbt->set_draw_center(false);
 	focus_sbt->set_border_width_all(1 * EDSCALE);
 	focus_sbt = change_border_color(focus_sbt, contrast_color_2);
 	theme->set_stylebox("Focus", "EditorStyles", focus_sbt);
@@ -301,7 +301,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
 	Ref<StyleBoxFlat> style_menu_hover_border = make_flat_stylebox(highlight_color, 4, 4, 4, 4);
 	Ref<StyleBoxFlat> style_menu_hover_bg = make_flat_stylebox(dark_color_2, 4, 4, 4, 4);
 
-	style_menu_hover_border->set_filled(false);
+	style_menu_hover_border->set_draw_center(false);
 	style_menu_hover_border->set_border_width(MARGIN_BOTTOM, border_width);
 	style_menu_hover_border->set_border_color_all(highlight_color);
 	style_menu_hover_border->set_expand_margin_size(MARGIN_BOTTOM, border_width);
@@ -343,7 +343,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
 	theme->set_stylebox("Content", "EditorStyles", style_content_panel_vp);
 
 	Ref<StyleBoxFlat> style_button_type = make_flat_stylebox(dark_color_1, 6, 4, 6, 4);
-	style_button_type->set_filled(true);
+	style_button_type->set_draw_center(true);
 	style_button_type->set_border_width_all(border_width);
 	style_button_type->set_border_color_all(contrast_color_2);
 
@@ -454,7 +454,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
 	theme->set_stylebox("selected", "Tree", style_tree_selected);
 
 	Ref<StyleBoxFlat> style_tree_cursor = make_flat_stylebox(HIGHLIGHT_COLOR_BG, 4, 4, 4, 4);
-	style_tree_cursor->set_filled(false);
+	style_tree_cursor->set_draw_center(false);
 	style_tree_cursor->set_border_width_all(border_width);
 	style_tree_cursor->set_border_color_all(contrast_color_1);
 
@@ -481,7 +481,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
 	style_itemlist_bg->set_border_color_all(dark_color_3);
 
 	Ref<StyleBoxFlat> style_itemlist_cursor = make_flat_stylebox(highlight_color, 0, 0, 0, 0);
-	style_itemlist_cursor->set_filled(false);
+	style_itemlist_cursor->set_draw_center(false);
 	style_itemlist_cursor->set_border_width_all(border_width);
 	style_itemlist_cursor->set_border_color_all(HIGHLIGHT_COLOR_BG);
 	theme->set_stylebox("cursor", "ItemList", style_itemlist_cursor);
@@ -495,7 +495,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
 
 	Ref<StyleBoxFlat> style_tab_fg = make_flat_stylebox(tab_color, 15, 5, 15, 5);
 	Ref<StyleBoxFlat> style_tab_bg = make_flat_stylebox(tab_color, 15, 5, 15, 5);
-	style_tab_bg->set_filled(false);
+	style_tab_bg->set_draw_center(false);
 
 	// Tabs & TabContainer
 	theme->set_stylebox("tab_fg", "TabContainer", style_tab_fg);
@@ -524,7 +524,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
 
 	Ref<StyleBoxFlat> style_tab_fg_debugger = make_flat_stylebox(dark_color_2, 10, 5, 10, 5);
 	Ref<StyleBoxFlat> style_tab_bg_debugger = make_flat_stylebox(dark_color_2, 10, 5, 10, 5);
-	style_tab_bg_debugger->set_filled(false);
+	style_tab_bg_debugger->set_draw_center(false);
 
 	theme->set_stylebox("DebuggerTabFG", "EditorStyles", style_tab_fg_debugger);
 	theme->set_stylebox("DebuggerTabBG", "EditorStyles", style_tab_bg_debugger);

scene/gui/patch_9_rect.cpp

@@ -61,7 +61,7 @@ void NinePatchRect::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_region_rect", "rect"), &NinePatchRect::set_region_rect);
 	ClassDB::bind_method(D_METHOD("get_region_rect"), &NinePatchRect::get_region_rect);
 	ClassDB::bind_method(D_METHOD("set_draw_center", "draw_center"), &NinePatchRect::set_draw_center);
-	ClassDB::bind_method(D_METHOD("get_draw_center"), &NinePatchRect::get_draw_center);
+	ClassDB::bind_method(D_METHOD("is_draw_center_enabled"), &NinePatchRect::is_draw_center_enabled);
 	ClassDB::bind_method(D_METHOD("set_h_axis_stretch_mode", "mode"), &NinePatchRect::set_h_axis_stretch_mode);
 	ClassDB::bind_method(D_METHOD("get_h_axis_stretch_mode"), &NinePatchRect::get_h_axis_stretch_mode);
 	ClassDB::bind_method(D_METHOD("set_v_axis_stretch_mode", "mode"), &NinePatchRect::set_v_axis_stretch_mode);
@@ -70,7 +70,7 @@ void NinePatchRect::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("texture_changed"));
 
 	ADD_PROPERTYNZ(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), "set_texture", "get_texture");
-	ADD_PROPERTYNO(PropertyInfo(Variant::BOOL, "draw_center"), "set_draw_center", "get_draw_center");
+	ADD_PROPERTYNO(PropertyInfo(Variant::BOOL, "draw_center"), "set_draw_center", "is_draw_center_enabled");
 	ADD_PROPERTYNZ(PropertyInfo(Variant::RECT2, "region_rect"), "set_region_rect", "get_region_rect");
 
 	ADD_GROUP("Patch Margin", "patch_margin_");
@@ -151,13 +151,13 @@ Rect2 NinePatchRect::get_region_rect() const {
 	return region_rect;
 }
 
-void NinePatchRect::set_draw_center(bool p_draw) {
+void NinePatchRect::set_draw_center(bool p_enabled) {
 
-	draw_center = p_draw;
+	draw_center = p_enabled;
 	update();
 }
 
-bool NinePatchRect::get_draw_center() const {
+bool NinePatchRect::is_draw_center_enabled() const {
 
 	return draw_center;
 }

scene/gui/patch_9_rect.h

@@ -67,8 +67,8 @@ public:
 	void set_region_rect(const Rect2 &p_region_rect);
 	Rect2 get_region_rect() const;
 
-	void set_draw_center(bool p_draw);
-	bool get_draw_center() const;
+	void set_draw_center(bool p_enabled);
+	bool is_draw_center_enabled() const;
 
 	void set_h_axis_stretch_mode(AxisStretchMode p_mode);
 	AxisStretchMode get_h_axis_stretch_mode() const;

scene/resources/style_box.cpp

@@ -165,13 +165,13 @@ void StyleBoxTexture::draw(RID p_canvas_item, const Rect2 &p_rect) const {
 	VisualServer::get_singleton()->canvas_item_add_nine_patch(p_canvas_item, rect, src_rect, texture->get_rid(), Vector2(margin[MARGIN_LEFT], margin[MARGIN_TOP]), Vector2(margin[MARGIN_RIGHT], margin[MARGIN_BOTTOM]), VS::NinePatchAxisMode(axis_h), VS::NinePatchAxisMode(axis_v), draw_center, modulate, normal_rid);
 }
 
-void StyleBoxTexture::set_draw_center(bool p_draw) {
+void StyleBoxTexture::set_draw_center(bool p_enabled) {
 
-	draw_center = p_draw;
+	draw_center = p_enabled;
 	emit_changed();
 }
 
-bool StyleBoxTexture::get_draw_center() const {
+bool StyleBoxTexture::is_draw_center_enabled() const {
 
 	return draw_center;
 }
@@ -281,7 +281,7 @@ void StyleBoxTexture::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_region_rect"), &StyleBoxTexture::get_region_rect);
 
 	ClassDB::bind_method(D_METHOD("set_draw_center", "enable"), &StyleBoxTexture::set_draw_center);
-	ClassDB::bind_method(D_METHOD("get_draw_center"), &StyleBoxTexture::get_draw_center);
+	ClassDB::bind_method(D_METHOD("is_draw_center_enabled"), &StyleBoxTexture::is_draw_center_enabled);
 
 	ClassDB::bind_method(D_METHOD("set_modulate", "color"), &StyleBoxTexture::set_modulate);
 	ClassDB::bind_method(D_METHOD("get_modulate"), &StyleBoxTexture::get_modulate);
@@ -312,7 +312,7 @@ void StyleBoxTexture::_bind_methods() {
 	ADD_PROPERTYNZ(PropertyInfo(Variant::INT, "axis_stretch_vertical", PROPERTY_HINT_ENUM, "Stretch,Tile,Tile Fit"), "set_v_axis_stretch_mode", "get_v_axis_stretch_mode");
 	ADD_GROUP("Modulate", "modulate_");
 	ADD_PROPERTY(PropertyInfo(Variant::COLOR, "modulate_color"), "set_modulate", "get_modulate");
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "draw_center"), "set_draw_center", "get_draw_center");
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "draw_center"), "set_draw_center", "is_draw_center_enabled");
 
 	BIND_ENUM_CONSTANT(AXIS_STRETCH_MODE_STRETCH);
 	BIND_ENUM_CONSTANT(AXIS_STRETCH_MODE_TILE);
@@ -460,14 +460,14 @@ float StyleBoxFlat::get_expand_margin_size(Margin p_expand_margin) const {
 
 	return expand_margin[p_expand_margin];
 }
-void StyleBoxFlat::set_filled(bool p_filled) {
+void StyleBoxFlat::set_draw_center(bool p_enabled) {
 
-	filled = p_filled;
+	draw_center = p_enabled;
 	emit_changed();
 }
-bool StyleBoxFlat::is_filled() const {
+bool StyleBoxFlat::is_draw_center_enabled() const {
 
-	return filled;
+	return draw_center;
 }
 
 void StyleBoxFlat::set_shadow_color(const Color &p_color) {
@@ -691,7 +691,7 @@ void StyleBoxFlat::draw(RID p_canvas_item, const Rect2 &p_rect) const {
 			style_rect, adapted_border, inner_color, border_color.read().ptr(), corner_detail);
 
 	//DRAW INFILL
-	if (filled) {
+	if (draw_center) {
 		int temp_vert_offset = verts.size();
 		int no_border[4] = { 0, 0, 0, 0 };
 		draw_ring(verts, indices, colors, style_rect, adapted_corner,
@@ -724,7 +724,7 @@ void StyleBoxFlat::draw(RID p_canvas_item, const Rect2 &p_rect) const {
 
 		int aa_border_width[4] = { aa_size, aa_size, aa_size, aa_size };
 
-		if (filled) {
+		if (draw_center) {
 			if (!blend_border) {
 				//INFILL AA
 				draw_ring(verts, indices, colors, style_rect, adapted_corner,
@@ -776,8 +776,8 @@ void StyleBoxFlat::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_expand_margin_individual", "size_left", "size_top", "size_right", "size_bottom"), &StyleBoxFlat::set_expand_margin_size_individual);
 	ClassDB::bind_method(D_METHOD("get_expand_margin", "margin"), &StyleBoxFlat::get_expand_margin_size);
 
-	ClassDB::bind_method(D_METHOD("set_filled", "filled"), &StyleBoxFlat::set_filled);
-	ClassDB::bind_method(D_METHOD("is_filled"), &StyleBoxFlat::is_filled);
+	ClassDB::bind_method(D_METHOD("set_draw_center", "draw_center"), &StyleBoxFlat::set_draw_center);
+	ClassDB::bind_method(D_METHOD("is_draw_center_enabled"), &StyleBoxFlat::is_draw_center_enabled);
 
 	ClassDB::bind_method(D_METHOD("set_shadow_color", "color"), &StyleBoxFlat::set_shadow_color);
 	ClassDB::bind_method(D_METHOD("get_shadow_color"), &StyleBoxFlat::get_shadow_color);
@@ -796,7 +796,7 @@ void StyleBoxFlat::_bind_methods() {
 
 	ADD_PROPERTY(PropertyInfo(Variant::COLOR, "bg_color"), "set_bg_color", "get_bg_color");
 
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "filled"), "set_filled", "is_filled");
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "draw_center"), "set_draw_center", "is_draw_center_enabled");
 
 	ADD_GROUP("Border Width", "border_width_");
 	ADD_PROPERTYI(PropertyInfo(Variant::INT, "border_width_left", PROPERTY_HINT_RANGE, "0,1024,1"), "set_border_width", "get_border_width", MARGIN_LEFT);
@@ -843,7 +843,7 @@ StyleBoxFlat::StyleBoxFlat() {
 	border_color.append(Color(0.8, 0.8, 0.8));
 
 	blend_border = false;
-	filled = true;
+	draw_center = true;
 	anti_aliased = true;
 
 	shadow_size = 0;

scene/resources/style_box.h

@@ -117,8 +117,8 @@ public:
 	void set_normal_map(RES p_normal_map);
 	RES get_normal_map() const;
 
-	void set_draw_center(bool p_draw);
-	bool get_draw_center() const;
+	void set_draw_center(bool p_enabled);
+	bool is_draw_center_enabled() const;
 	virtual Size2 get_center_size() const;
 
 	void set_h_axis_stretch_mode(AxisStretchMode p_mode);
@@ -150,7 +150,7 @@ class StyleBoxFlat : public StyleBox {
 	int expand_margin[4];
 	int corner_radius[4];
 
-	bool filled;
+	bool draw_center;
 	bool blend_border;
 	bool anti_aliased;
 
@@ -202,9 +202,9 @@ public:
 	void set_expand_margin_size_individual(float p_left, float p_top, float p_right, float p_bottom);
 	float get_expand_margin_size(Margin p_expand_margin) const;
 
-	//FILLED
-	void set_filled(bool p_draw);
-	bool is_filled() const;
+	//DRAW CENTER
+	void set_draw_center(bool p_enabled);
+	bool is_draw_center_enabled() const;
 
 	//SHADOW
 	void set_shadow_color(const Color &p_color);