godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #47235 from opl-/fix/25046-3.x

Browse Source
This commit is contained in:
Rémi Verschelde 2021-09-16 15:24:09 +02:00 committed by GitHub
commit c33ff6bf6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scene/resources/dynamic_font.cpp
View File

@ -670,7 +670,7 @@ DynamicFontAtSize::~DynamicFontAtSize() {
/////////////////////////
void DynamicFont::_reload_cache() {
void DynamicFont::_reload_cache(const char *p_triggering_property) {
ERR_FAIL_COND(cache_id.size < 1);
if (!data.is_valid()) {
data_at_size.unref();
@ -698,15 +698,12 @@ void DynamicFont::_reload_cache() {
}
emit_changed();
_change_notify();
_change_notify(p_triggering_property);
}
void DynamicFont::set_font_data(const Ref<DynamicFontData> &p_data) {
data = p_data;
_reload_cache();
emit_changed();
_change_notify();
_reload_cache(); // not passing the prop name as clearing the font data also clears fallbacks
}
Ref<DynamicFontData> DynamicFont::get_font_data() const {
@ -719,7 +716,7 @@ void DynamicFont::set_size(int p_size) {
}
cache_id.size = p_size;
outline_cache_id.size = p_size;
_reload_cache();
_reload_cache("size");
}
int DynamicFont::get_size() const {
@ -732,7 +729,7 @@ void DynamicFont::set_outline_size(int p_size) {
}
ERR_FAIL_COND(p_size < 0 || p_size > UINT8_MAX);
outline_cache_id.outline_size = p_size;
_reload_cache();
_reload_cache("outline_size");
}
int DynamicFont::get_outline_size() const {
@ -743,7 +740,7 @@ void DynamicFont::set_outline_color(Color p_color) {
if (p_color != outline_color) {
outline_color = p_color;
emit_changed();
_change_notify();
_change_notify("outline_color");
}
}
@ -816,16 +813,19 @@ int DynamicFont::get_spacing(int p_type) const {
void DynamicFont::set_spacing(int p_type, int p_value) {
if (p_type == SPACING_TOP) {
spacing_top = p_value;
_change_notify("extra_spacing_top");
} else if (p_type == SPACING_BOTTOM) {
spacing_bottom = p_value;
_change_notify("extra_spacing_bottom");
} else if (p_type == SPACING_CHAR) {
spacing_char = p_value;
_change_notify("extra_spacing_char");
} else if (p_type == SPACING_SPACE) {
spacing_space = p_value;
_change_notify("extra_spacing_space");
}
emit_changed();
_change_notify();
}
float DynamicFont::get_height() const {
@ -929,7 +929,6 @@ void DynamicFont::add_fallback(const Ref<DynamicFontData> &p_data) {
fallback_outline_data_at_size.push_back(fallbacks.write[fallbacks.size() - 1]->_get_dynamic_font_at_size(outline_cache_id));
}
_change_notify();
emit_changed();
_change_notify();
}

2
scene/resources/dynamic_font.h
View File

@ -232,7 +232,7 @@ private:
Color outline_color;
protected:
void _reload_cache();
void _reload_cache(const char *p_triggering_property = "");
bool _set(const StringName &p_name, const Variant &p_value);
bool _get(const StringName &p_name, Variant &r_ret) const;