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

Merge pull request #91793 from KoBeWi/a_theme_has_many_variations 

Fallback to default theme for variation items
This commit is contained in:
Rémi Verschelde 2024-05-11 12:38:24 +02:00
parent 1cf283dd26 d7bedcdf43
commit 768bd0e97d
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
editor/plugins/theme_editor_plugin.cpp
View File

@ -2386,9 +2386,25 @@ HashMap<StringName, bool> ThemeTypeEditor::_get_type_items(String p_type_name, T
if (p_include_default) {
names.clear();
String default_type = p_type_name;
if (edited_theme->get_type_variation_base(p_type_name) != StringName()) {
default_type = edited_theme->get_type_variation_base(p_type_name);
String default_type;
{
const StringName variation_base = edited_theme->get_type_variation_base(p_type_name);
if (variation_base != StringName()) {
default_type = variation_base;
}
}
if (default_type.is_empty()) {
// If variation base was not found in the edited theme, look in the default theme.
const StringName variation_base = ThemeDB::get_singleton()->get_default_theme()->get_type_variation_base(p_type_name);
if (variation_base != StringName()) {
default_type = variation_base;
}
}
if (default_type.is_empty()) {
default_type = p_type_name;
}
List<ThemeDB::ThemeItemBind> theme_binds;