diff --git a/doc/classes/LabelSettings.xml b/doc/classes/LabelSettings.xml index 88b0571fed8..d97e8608f0e 100644 --- a/doc/classes/LabelSettings.xml +++ b/doc/classes/LabelSettings.xml @@ -42,7 +42,7 @@ The color of the shadow outline. If alpha is [code]0[/code], no shadow outline will be drawn. - + Shadow outline size. diff --git a/scene/gui/label.cpp b/scene/gui/label.cpp index 572c8589729..5285166d64e 100644 --- a/scene/gui/label.cpp +++ b/scene/gui/label.cpp @@ -440,7 +440,7 @@ void Label::_notification(int p_what) { Color font_outline_color = has_settings ? settings->get_outline_color() : theme_cache.font_outline_color; Color font_shadow_outline_color = has_settings ? settings->get_shadow_outline_color() : theme_cache.font_shadow_outline_color; int outline_size = has_settings ? settings->get_outline_size() : theme_cache.font_outline_size; - int shadow_outline_size = has_settings ? settings->get_shadow_outline_size() : theme_cache.font_shadow_outline_size; + int shadow_outline_size = has_settings ? settings->get_shadow_size() : theme_cache.font_shadow_outline_size; bool shadow_before_outline = has_settings ? settings->get_draw_shadow_before_outline() : theme_cache.draw_shadow_before_outline; bool rtl = (TS->shaped_text_get_inferred_direction(text_rid) == TextServer::DIRECTION_RTL); bool rtl_layout = is_layout_rtl(); diff --git a/scene/resources/label_settings.cpp b/scene/resources/label_settings.cpp index 239c6527074..7bdc79950ef 100644 --- a/scene/resources/label_settings.cpp +++ b/scene/resources/label_settings.cpp @@ -53,8 +53,8 @@ void LabelSettings::_bind_methods() { ClassDB::bind_method(D_METHOD("set_outline_color", "color"), &LabelSettings::set_outline_color); ClassDB::bind_method(D_METHOD("get_outline_color"), &LabelSettings::get_outline_color); - ClassDB::bind_method(D_METHOD("set_shadow_outline_size", "size"), &LabelSettings::set_shadow_outline_size); - ClassDB::bind_method(D_METHOD("get_shadow_outline_size"), &LabelSettings::get_shadow_outline_size); + ClassDB::bind_method(D_METHOD("set_shadow_size", "size"), &LabelSettings::set_shadow_size); + ClassDB::bind_method(D_METHOD("get_shadow_size"), &LabelSettings::get_shadow_size); ClassDB::bind_method(D_METHOD("set_shadow_color", "color"), &LabelSettings::set_shadow_color); ClassDB::bind_method(D_METHOD("get_shadow_color"), &LabelSettings::get_shadow_color); @@ -80,7 +80,7 @@ void LabelSettings::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::COLOR, "outline_color"), "set_outline_color", "get_outline_color"); ADD_GROUP("Shadow", "shadow_"); - ADD_PROPERTY(PropertyInfo(Variant::INT, "shadow_outline_size", PROPERTY_HINT_RANGE, "0,127,1,or_greater,suffix:px"), "set_shadow_outline_size", "get_shadow_outline_size"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "shadow_size", PROPERTY_HINT_RANGE, "0,127,1,or_greater,suffix:px"), "set_shadow_size", "get_shadow_size"); ADD_PROPERTY(PropertyInfo(Variant::COLOR, "shadow_color"), "set_shadow_color", "get_shadow_color"); ADD_PROPERTY(PropertyInfo(Variant::COLOR, "shadow_outline_color"), "set_shadow_outline_color", "get_shadow_outline_color"); ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "shadow_offset", PROPERTY_HINT_NONE, "suffix:px"), "set_shadow_offset", "get_shadow_offset"); @@ -159,15 +159,15 @@ Color LabelSettings::get_outline_color() const { return outline_color; } -void LabelSettings::set_shadow_outline_size(int p_size) { - if (shadow_outline_size != p_size) { - shadow_outline_size = p_size; +void LabelSettings::set_shadow_size(int p_size) { + if (shadow_size != p_size) { + shadow_size = p_size; emit_changed(); } } -int LabelSettings::get_shadow_outline_size() const { - return shadow_outline_size; +int LabelSettings::get_shadow_size() const { + return shadow_size; } void LabelSettings::set_shadow_color(const Color &p_color) { diff --git a/scene/resources/label_settings.h b/scene/resources/label_settings.h index 76ea48f17ca..271673db9a6 100644 --- a/scene/resources/label_settings.h +++ b/scene/resources/label_settings.h @@ -48,7 +48,7 @@ class LabelSettings : public Resource { int outline_size = 0; Color outline_color = Color(0, 0, 0, 1); - int shadow_outline_size = 0; + int shadow_size = 0; Color shadow_color = Color(0, 0, 0, 0); Color shadow_outline_color = Color(0, 0, 0, 0); Vector2 shadow_offset = Vector2(1, 1); @@ -78,8 +78,8 @@ public: void set_outline_color(const Color &p_color); Color get_outline_color() const; - void set_shadow_outline_size(int p_size); - int get_shadow_outline_size() const; + void set_shadow_size(int p_size); + int get_shadow_size() const; void set_shadow_color(const Color &p_color); Color get_shadow_color() const;