godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-23 15:16:17 +00:00
Code Releases Wiki Activity

Merge pull request #101066 from DanielGSilva/font-variation-inheritance

Browse Source 
Fix `has_font` and `has_font_size` always return true
This commit is contained in:
Rémi Verschelde
2025-01-07 23:17:51 +01:00
parent 3e53d73996 94a7dfeae1
commit b401a87066
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scene/resources/theme.cpp
View File

@@ -513,6 +513,10 @@ bool Theme::has_font(const StringName &p_name, const StringName &p_theme_type) c
return ((font_map.has(p_theme_type) && font_map[p_theme_type].has(p_name) && font_map[p_theme_type][p_name].is_valid()) || has_default_font()); return ((font_map.has(p_theme_type) && font_map[p_theme_type].has(p_name) && font_map[p_theme_type][p_name].is_valid()) || has_default_font());
} }
bool Theme::has_font_no_default(const StringName &p_name, const StringName &p_theme_type) const {
return (font_map.has(p_theme_type) && font_map[p_theme_type].has(p_name) && font_map[p_theme_type][p_name].is_valid());
}
bool Theme::has_font_nocheck(const StringName &p_name, const StringName &p_theme_type) const { bool Theme::has_font_nocheck(const StringName &p_name, const StringName &p_theme_type) const {
return (font_map.has(p_theme_type) && font_map[p_theme_type].has(p_name)); return (font_map.has(p_theme_type) && font_map[p_theme_type].has(p_name));
} }
@@ -616,6 +620,10 @@ bool Theme::has_font_size(const StringName &p_name, const StringName &p_theme_ty
return ((font_size_map.has(p_theme_type) && font_size_map[p_theme_type].has(p_name) && (font_size_map[p_theme_type][p_name] > 0)) || has_default_font_size()); return ((font_size_map.has(p_theme_type) && font_size_map[p_theme_type].has(p_name) && (font_size_map[p_theme_type][p_name] > 0)) || has_default_font_size());
} }
bool Theme::has_font_size_no_default(const StringName &p_name, const StringName &p_theme_type) const {
return (font_size_map.has(p_theme_type) && font_size_map[p_theme_type].has(p_name) && (font_size_map[p_theme_type][p_name] > 0));
}
bool Theme::has_font_size_nocheck(const StringName &p_name, const StringName &p_theme_type) const { bool Theme::has_font_size_nocheck(const StringName &p_name, const StringName &p_theme_type) const {
return (font_size_map.has(p_theme_type) && font_size_map[p_theme_type].has(p_name)); return (font_size_map.has(p_theme_type) && font_size_map[p_theme_type].has(p_name));
} }
@@ -923,9 +931,17 @@ bool Theme::has_theme_item(DataType p_data_type, const StringName &p_name, const
case DATA_TYPE_CONSTANT: case DATA_TYPE_CONSTANT:
return has_constant(p_name, p_theme_type); return has_constant(p_name, p_theme_type);
case DATA_TYPE_FONT: case DATA_TYPE_FONT:
if (!variation_map.has(p_theme_type)) {
return has_font(p_name, p_theme_type); return has_font(p_name, p_theme_type);
} else {
return has_font_no_default(p_name, p_theme_type);
}
case DATA_TYPE_FONT_SIZE: case DATA_TYPE_FONT_SIZE:
if (!variation_map.has(p_theme_type)) {
return has_font_size(p_name, p_theme_type); return has_font_size(p_name, p_theme_type);
} else {
return has_font_size_no_default(p_name, p_theme_type);
}
case DATA_TYPE_ICON: case DATA_TYPE_ICON:
return has_icon(p_name, p_theme_type); return has_icon(p_name, p_theme_type);
case DATA_TYPE_STYLEBOX: case DATA_TYPE_STYLEBOX:

2
scene/resources/theme.h
View File

@@ -155,6 +155,7 @@ public:
void set_font(const StringName &p_name, const StringName &p_theme_type, const Ref<Font> &p_font); void set_font(const StringName &p_name, const StringName &p_theme_type, const Ref<Font> &p_font);
virtual Ref<Font> get_font(const StringName &p_name, const StringName &p_theme_type) const; virtual Ref<Font> get_font(const StringName &p_name, const StringName &p_theme_type) const;
bool has_font(const StringName &p_name, const StringName &p_theme_type) const; bool has_font(const StringName &p_name, const StringName &p_theme_type) const;
bool has_font_no_default(const StringName &p_name, const StringName &p_theme_type) const;
bool has_font_nocheck(const StringName &p_name, const StringName &p_theme_type) const; bool has_font_nocheck(const StringName &p_name, const StringName &p_theme_type) const;
void rename_font(const StringName &p_old_name, const StringName &p_name, const StringName &p_theme_type); void rename_font(const StringName &p_old_name, const StringName &p_name, const StringName &p_theme_type);
void clear_font(const StringName &p_name, const StringName &p_theme_type); void clear_font(const StringName &p_name, const StringName &p_theme_type);
@@ -166,6 +167,7 @@ public:
void set_font_size(const StringName &p_name, const StringName &p_theme_type, int p_font_size); void set_font_size(const StringName &p_name, const StringName &p_theme_type, int p_font_size);
virtual int get_font_size(const StringName &p_name, const StringName &p_theme_type) const; virtual int get_font_size(const StringName &p_name, const StringName &p_theme_type) const;
bool has_font_size(const StringName &p_name, const StringName &p_theme_type) const; bool has_font_size(const StringName &p_name, const StringName &p_theme_type) const;
bool has_font_size_no_default(const StringName &p_name, const StringName &p_theme_type) const;
bool has_font_size_nocheck(const StringName &p_name, const StringName &p_theme_type) const; bool has_font_size_nocheck(const StringName &p_name, const StringName &p_theme_type) const;
void rename_font_size(const StringName &p_old_name, const StringName &p_name, const StringName &p_theme_type); void rename_font_size(const StringName &p_old_name, const StringName &p_name, const StringName &p_theme_type);
void clear_font_size(const StringName &p_name, const StringName &p_theme_type); void clear_font_size(const StringName &p_name, const StringName &p_theme_type);