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

Merge pull request #61321 from bruvzg/lbl3d_theme_font_chk_4x

This commit is contained in:
Rémi Verschelde 2022-05-23 18:54:28 +02:00 committed by GitHub
parent a76db34592 f9fbe92e8a
commit c869e649b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
scene/3d/label_3d.cpp
View File

@ -788,6 +788,11 @@ Ref<Font> Label3D::get_font() const {
} }
Ref<Font> Label3D::_get_font_or_default() const { Ref<Font> Label3D::_get_font_or_default() const {
if (theme_font.is_valid()) {
theme_font->disconnect(CoreStringNames::get_singleton()->changed, Callable(const_cast<Label3D *>(this), "_font_changed"));
theme_font.unref();
}
if (font_override.is_valid() && font_override->get_data_count() > 0) { if (font_override.is_valid() && font_override->get_data_count() > 0) {
return font_override; return font_override;
} }
@ -799,7 +804,12 @@ Ref<Font> Label3D::_get_font_or_default() const {
for (const StringName &E : theme_types) { for (const StringName &E : theme_types) {
if (Theme::get_project_default()->has_theme_item(Theme::DATA_TYPE_FONT, "font", E)) { if (Theme::get_project_default()->has_theme_item(Theme::DATA_TYPE_FONT, "font", E)) {
return Theme::get_project_default()->get_theme_item(Theme::DATA_TYPE_FONT, "font", E); Ref<Font> f = Theme::get_project_default()->get_theme_item(Theme::DATA_TYPE_FONT, "font", E);
if (f.is_valid()) {
theme_font = f;
theme_font->connect(CoreStringNames::get_singleton()->changed, Callable(const_cast<Label3D *>(this), "_font_changed"));
}
return f;
} }
} }
} }
@ -811,13 +821,23 @@ Ref<Font> Label3D::_get_font_or_default() const {
for (const StringName &E : theme_types) { for (const StringName &E : theme_types) {
if (Theme::get_default()->has_theme_item(Theme::DATA_TYPE_FONT, "font", E)) { if (Theme::get_default()->has_theme_item(Theme::DATA_TYPE_FONT, "font", E)) {
return Theme::get_default()->get_theme_item(Theme::DATA_TYPE_FONT, "font", E); Ref<Font> f = Theme::get_default()->get_theme_item(Theme::DATA_TYPE_FONT, "font", E);
if (f.is_valid()) {
theme_font = f;
theme_font->connect(CoreStringNames::get_singleton()->changed, Callable(const_cast<Label3D *>(this), "_font_changed"));
}
return f;
} }
} }
} }
// If they don't exist, use any type to return the default/empty value. // If they don't exist, use any type to return the default/empty value.
return Theme::get_default()->get_theme_item(Theme::DATA_TYPE_FONT, "font", StringName()); Ref<Font> f = Theme::get_default()->get_theme_item(Theme::DATA_TYPE_FONT, "font", StringName());
if (f.is_valid()) {
theme_font = f;
theme_font->connect(CoreStringNames::get_singleton()->changed, Callable(const_cast<Label3D *>(this), "_font_changed"));
}
return f;
} }
void Label3D::set_font_size(int p_size) { void Label3D::set_font_size(int p_size) {

1
scene/3d/label_3d.h
View File

@ -96,6 +96,7 @@ private:
int font_size = 16; int font_size = 16;
Ref<Font> font_override; Ref<Font> font_override;
mutable Ref<Font> theme_font;
Color modulate = Color(1, 1, 1, 1); Color modulate = Color(1, 1, 1, 1);
Point2 lbl_offset; Point2 lbl_offset;
int outline_render_priority = -1; int outline_render_priority = -1;