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

Merge pull request #93602 from aaronp64/inspector_latency 

Improve Editor Inspector/Theme item lookup performance
This commit is contained in:
Rémi Verschelde 2024-08-22 00:10:26 +02:00
parent 3b81db3bf0 7593e55527
commit 091212b4f1
No known key found for this signature in database
GPG Key ID: C3336907360768E1
16 changed files with 140 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
core/object/class_db.cpp
View File

@ -303,6 +303,29 @@ StringName ClassDB::get_parent_class_nocheck(const StringName &p_class) {
return ti->inherits; return ti->inherits;
} }
bool ClassDB::get_inheritance_chain_nocheck(const StringName &p_class, Vector<StringName> &r_result) {
OBJTYPE_RLOCK;
ClassInfo *start = classes.getptr(p_class);
if (!start) {
return false;
}
int classes_to_add = 0;
for (ClassInfo *ti = start; ti; ti = ti->inherits_ptr) {
classes_to_add++;
}
int64_t old_size = r_result.size();
r_result.resize(old_size + classes_to_add);
StringName *w = r_result.ptrw() + old_size;
for (ClassInfo *ti = start; ti; ti = ti->inherits_ptr) {
*w++ = ti->name;
}
return true;
}
StringName ClassDB::get_compatibility_remapped_class(const StringName &p_class) { StringName ClassDB::get_compatibility_remapped_class(const StringName &p_class) {
if (classes.has(p_class)) { if (classes.has(p_class)) {
return p_class; return p_class;

1
core/object/class_db.h
View File

@ -282,6 +282,7 @@ public:
static void get_inheriters_from_class(const StringName &p_class, List<StringName> *p_classes); static void get_inheriters_from_class(const StringName &p_class, List<StringName> *p_classes);
static void get_direct_inheriters_from_class(const StringName &p_class, List<StringName> *p_classes); static void get_direct_inheriters_from_class(const StringName &p_class, List<StringName> *p_classes);
static StringName get_parent_class_nocheck(const StringName &p_class); static StringName get_parent_class_nocheck(const StringName &p_class);
static bool get_inheritance_chain_nocheck(const StringName &p_class, Vector<StringName> &r_result);
static StringName get_parent_class(const StringName &p_class); static StringName get_parent_class(const StringName &p_class);
static StringName get_compatibility_remapped_class(const StringName &p_class); static StringName get_compatibility_remapped_class(const StringName &p_class);
static bool class_exists(const StringName &p_class); static bool class_exists(const StringName &p_class);

4
editor/editor_node.cpp
View File

@ -511,7 +511,7 @@ void EditorNode::_update_theme(bool p_skip_creation) {
DisplayServer::set_early_window_clear_color_override(true, theme->get_color(SNAME("background"), EditorStringName(Editor))); DisplayServer::set_early_window_clear_color_override(true, theme->get_color(SNAME("background"), EditorStringName(Editor)));
} }
List<Ref<Theme>> editor_themes; Vector<Ref<Theme>> editor_themes;
editor_themes.push_back(theme); editor_themes.push_back(theme);
editor_themes.push_back(ThemeDB::get_singleton()->get_default_theme()); editor_themes.push_back(ThemeDB::get_singleton()->get_default_theme());
@ -580,7 +580,7 @@ void EditorNode::update_preview_themes(int p_mode) {
return; // Too early. return; // Too early.
} }
List<Ref<Theme>> preview_themes; Vector<Ref<Theme>> preview_themes;
switch (p_mode) { switch (p_mode) {
case CanvasItemEditor::THEME_PREVIEW_PROJECT: case CanvasItemEditor::THEME_PREVIEW_PROJECT:

2
editor/plugins/theme_editor_preview.cpp
View File

@ -205,7 +205,7 @@ void ThemeEditorPreview::_notification(int p_what) {
} break; } break;
case NOTIFICATION_READY: { case NOTIFICATION_READY: {
List<Ref<Theme>> preview_themes; Vector<Ref<Theme>> preview_themes;
preview_themes.push_back(ThemeDB::get_singleton()->get_default_theme()); preview_themes.push_back(ThemeDB::get_singleton()->get_default_theme());
ThemeDB::get_singleton()->create_theme_context(preview_root, preview_themes); ThemeDB::get_singleton()->create_theme_context(preview_root, preview_themes);
} break; } break;

2
editor/project_manager.cpp
View File

@ -190,7 +190,7 @@ void ProjectManager::_update_theme(bool p_skip_creation) {
DisplayServer::set_early_window_clear_color_override(true, theme->get_color(SNAME("background"), EditorStringName(Editor))); DisplayServer::set_early_window_clear_color_override(true, theme->get_color(SNAME("background"), EditorStringName(Editor)));
} }
List<Ref<Theme>> editor_themes; Vector<Ref<Theme>> editor_themes;
editor_themes.push_back(theme); editor_themes.push_back(theme);
editor_themes.push_back(ThemeDB::get_singleton()->get_default_theme()); editor_themes.push_back(ThemeDB::get_singleton()->get_default_theme());

8
scene/3d/label_3d.cpp
View File

@ -797,13 +797,13 @@ Ref<Font> Label3D::_get_font_or_default() const {
} }
const StringName theme_name = SceneStringName(font); const StringName theme_name = SceneStringName(font);
List<StringName> theme_types; Vector<StringName> theme_types;
ThemeDB::get_singleton()->get_native_type_dependencies(get_class_name(), &theme_types); ThemeDB::get_singleton()->get_native_type_dependencies(get_class_name(), theme_types);
ThemeContext *global_context = ThemeDB::get_singleton()->get_default_theme_context(); ThemeContext *global_context = ThemeDB::get_singleton()->get_default_theme_context();
List<Ref<Theme>> themes = global_context->get_themes(); Vector<Ref<Theme>> themes = global_context->get_themes();
if (Engine::get_singleton()->is_editor_hint()) { if (Engine::get_singleton()->is_editor_hint()) {
themes.push_front(ThemeDB::get_singleton()->get_project_theme()); themes.insert(0, ThemeDB::get_singleton()->get_project_theme());
} }
for (const Ref<Theme> &theme : themes) { for (const Ref<Theme> &theme : themes) {

48
scene/gui/control.cpp
View File

@ -2577,8 +2577,8 @@ Ref<Texture2D> Control::get_theme_icon(const StringName &p_name, const StringNam
return data.theme_icon_cache[p_theme_type][p_name]; return data.theme_icon_cache[p_theme_type][p_name];
} }
List<StringName> theme_types; Vector<StringName> theme_types;
data.theme_owner->get_theme_type_dependencies(this, p_theme_type, &theme_types); data.theme_owner->get_theme_type_dependencies(this, p_theme_type, theme_types);
Ref<Texture2D> icon = data.theme_owner->get_theme_item_in_types(Theme::DATA_TYPE_ICON, p_name, theme_types); Ref<Texture2D> icon = data.theme_owner->get_theme_item_in_types(Theme::DATA_TYPE_ICON, p_name, theme_types);
data.theme_icon_cache[p_theme_type][p_name] = icon; data.theme_icon_cache[p_theme_type][p_name] = icon;
return icon; return icon;
@ -2601,8 +2601,8 @@ Ref<StyleBox> Control::get_theme_stylebox(const StringName &p_name, const String
return data.theme_style_cache[p_theme_type][p_name]; return data.theme_style_cache[p_theme_type][p_name];
} }
List<StringName> theme_types; Vector<StringName> theme_types;
data.theme_owner->get_theme_type_dependencies(this, p_theme_type, &theme_types); data.theme_owner->get_theme_type_dependencies(this, p_theme_type, theme_types);
Ref<StyleBox> style = data.theme_owner->get_theme_item_in_types(Theme::DATA_TYPE_STYLEBOX, p_name, theme_types); Ref<StyleBox> style = data.theme_owner->get_theme_item_in_types(Theme::DATA_TYPE_STYLEBOX, p_name, theme_types);
data.theme_style_cache[p_theme_type][p_name] = style; data.theme_style_cache[p_theme_type][p_name] = style;
return style; return style;
@ -2625,8 +2625,8 @@ Ref<Font> Control::get_theme_font(const StringName &p_name, const StringName &p_
return data.theme_font_cache[p_theme_type][p_name]; return data.theme_font_cache[p_theme_type][p_name];
} }
List<StringName> theme_types; Vector<StringName> theme_types;
data.theme_owner->get_theme_type_dependencies(this, p_theme_type, &theme_types); data.theme_owner->get_theme_type_dependencies(this, p_theme_type, theme_types);
Ref<Font> font = data.theme_owner->get_theme_item_in_types(Theme::DATA_TYPE_FONT, p_name, theme_types); Ref<Font> font = data.theme_owner->get_theme_item_in_types(Theme::DATA_TYPE_FONT, p_name, theme_types);
data.theme_font_cache[p_theme_type][p_name] = font; data.theme_font_cache[p_theme_type][p_name] = font;
return font; return font;
@ -2649,8 +2649,8 @@ int Control::get_theme_font_size(const StringName &p_name, const StringName &p_t
return data.theme_font_size_cache[p_theme_type][p_name]; return data.theme_font_size_cache[p_theme_type][p_name];
} }
List<StringName> theme_types; Vector<StringName> theme_types;
data.theme_owner->get_theme_type_dependencies(this, p_theme_type, &theme_types); data.theme_owner->get_theme_type_dependencies(this, p_theme_type, theme_types);
int font_size = data.theme_owner->get_theme_item_in_types(Theme::DATA_TYPE_FONT_SIZE, p_name, theme_types); int font_size = data.theme_owner->get_theme_item_in_types(Theme::DATA_TYPE_FONT_SIZE, p_name, theme_types);
data.theme_font_size_cache[p_theme_type][p_name] = font_size; data.theme_font_size_cache[p_theme_type][p_name] = font_size;
return font_size; return font_size;
@ -2673,8 +2673,8 @@ Color Control::get_theme_color(const StringName &p_name, const StringName &p_the
return data.theme_color_cache[p_theme_type][p_name]; return data.theme_color_cache[p_theme_type][p_name];
} }
List<StringName> theme_types; Vector<StringName> theme_types;
data.theme_owner->get_theme_type_dependencies(this, p_theme_type, &theme_types); data.theme_owner->get_theme_type_dependencies(this, p_theme_type, theme_types);
Color color = data.theme_owner->get_theme_item_in_types(Theme::DATA_TYPE_COLOR, p_name, theme_types); Color color = data.theme_owner->get_theme_item_in_types(Theme::DATA_TYPE_COLOR, p_name, theme_types);
data.theme_color_cache[p_theme_type][p_name] = color; data.theme_color_cache[p_theme_type][p_name] = color;
return color; return color;
@ -2697,8 +2697,8 @@ int Control::get_theme_constant(const StringName &p_name, const StringName &p_th
return data.theme_constant_cache[p_theme_type][p_name]; return data.theme_constant_cache[p_theme_type][p_name];
} }
List<StringName> theme_types; Vector<StringName> theme_types;
data.theme_owner->get_theme_type_dependencies(this, p_theme_type, &theme_types); data.theme_owner->get_theme_type_dependencies(this, p_theme_type, theme_types);
int constant = data.theme_owner->get_theme_item_in_types(Theme::DATA_TYPE_CONSTANT, p_name, theme_types); int constant = data.theme_owner->get_theme_item_in_types(Theme::DATA_TYPE_CONSTANT, p_name, theme_types);
data.theme_constant_cache[p_theme_type][p_name] = constant; data.theme_constant_cache[p_theme_type][p_name] = constant;
return constant; return constant;
@ -2743,8 +2743,8 @@ bool Control::has_theme_icon(const StringName &p_name, const StringName &p_theme
} }
} }
List<StringName> theme_types; Vector<StringName> theme_types;
data.theme_owner->get_theme_type_dependencies(this, p_theme_type, &theme_types); data.theme_owner->get_theme_type_dependencies(this, p_theme_type, theme_types);
return data.theme_owner->has_theme_item_in_types(Theme::DATA_TYPE_ICON, p_name, theme_types); return data.theme_owner->has_theme_item_in_types(Theme::DATA_TYPE_ICON, p_name, theme_types);
} }
@ -2760,8 +2760,8 @@ bool Control::has_theme_stylebox(const StringName &p_name, const StringName &p_t
} }
} }
List<StringName> theme_types; Vector<StringName> theme_types;
data.theme_owner->get_theme_type_dependencies(this, p_theme_type, &theme_types); data.theme_owner->get_theme_type_dependencies(this, p_theme_type, theme_types);
return data.theme_owner->has_theme_item_in_types(Theme::DATA_TYPE_STYLEBOX, p_name, theme_types); return data.theme_owner->has_theme_item_in_types(Theme::DATA_TYPE_STYLEBOX, p_name, theme_types);
} }
@ -2777,8 +2777,8 @@ bool Control::has_theme_font(const StringName &p_name, const StringName &p_theme
} }
} }
List<StringName> theme_types; Vector<StringName> theme_types;
data.theme_owner->get_theme_type_dependencies(this, p_theme_type, &theme_types); data.theme_owner->get_theme_type_dependencies(this, p_theme_type, theme_types);
return data.theme_owner->has_theme_item_in_types(Theme::DATA_TYPE_FONT, p_name, theme_types); return data.theme_owner->has_theme_item_in_types(Theme::DATA_TYPE_FONT, p_name, theme_types);
} }
@ -2794,8 +2794,8 @@ bool Control::has_theme_font_size(const StringName &p_name, const StringName &p_
} }
} }
List<StringName> theme_types; Vector<StringName> theme_types;
data.theme_owner->get_theme_type_dependencies(this, p_theme_type, &theme_types); data.theme_owner->get_theme_type_dependencies(this, p_theme_type, theme_types);
return data.theme_owner->has_theme_item_in_types(Theme::DATA_TYPE_FONT_SIZE, p_name, theme_types); return data.theme_owner->has_theme_item_in_types(Theme::DATA_TYPE_FONT_SIZE, p_name, theme_types);
} }
@ -2811,8 +2811,8 @@ bool Control::has_theme_color(const StringName &p_name, const StringName &p_them
} }
} }
List<StringName> theme_types; Vector<StringName> theme_types;
data.theme_owner->get_theme_type_dependencies(this, p_theme_type, &theme_types); data.theme_owner->get_theme_type_dependencies(this, p_theme_type, theme_types);
return data.theme_owner->has_theme_item_in_types(Theme::DATA_TYPE_COLOR, p_name, theme_types); return data.theme_owner->has_theme_item_in_types(Theme::DATA_TYPE_COLOR, p_name, theme_types);
} }
@ -2828,8 +2828,8 @@ bool Control::has_theme_constant(const StringName &p_name, const StringName &p_t
} }
} }
List<StringName> theme_types; Vector<StringName> theme_types;
data.theme_owner->get_theme_type_dependencies(this, p_theme_type, &theme_types); data.theme_owner->get_theme_type_dependencies(this, p_theme_type, theme_types);
return data.theme_owner->has_theme_item_in_types(Theme::DATA_TYPE_CONSTANT, p_name, theme_types); return data.theme_owner->has_theme_item_in_types(Theme::DATA_TYPE_CONSTANT, p_name, theme_types);
} }

48
scene/main/window.cpp
View File

@ -2149,8 +2149,8 @@ Ref<Texture2D> Window::get_theme_icon(const StringName &p_name, const StringName
return theme_icon_cache[p_theme_type][p_name]; return theme_icon_cache[p_theme_type][p_name];
} }
List<StringName> theme_types; Vector<StringName> theme_types;
theme_owner->get_theme_type_dependencies(this, p_theme_type, &theme_types); theme_owner->get_theme_type_dependencies(this, p_theme_type, theme_types);
Ref<Texture2D> icon = theme_owner->get_theme_item_in_types(Theme::DATA_TYPE_ICON, p_name, theme_types); Ref<Texture2D> icon = theme_owner->get_theme_item_in_types(Theme::DATA_TYPE_ICON, p_name, theme_types);
theme_icon_cache[p_theme_type][p_name] = icon; theme_icon_cache[p_theme_type][p_name] = icon;
return icon; return icon;
@ -2173,8 +2173,8 @@ Ref<StyleBox> Window::get_theme_stylebox(const StringName &p_name, const StringN
return theme_style_cache[p_theme_type][p_name]; return theme_style_cache[p_theme_type][p_name];
} }
List<StringName> theme_types; Vector<StringName> theme_types;
theme_owner->get_theme_type_dependencies(this, p_theme_type, &theme_types); theme_owner->get_theme_type_dependencies(this, p_theme_type, theme_types);
Ref<StyleBox> style = theme_owner->get_theme_item_in_types(Theme::DATA_TYPE_STYLEBOX, p_name, theme_types); Ref<StyleBox> style = theme_owner->get_theme_item_in_types(Theme::DATA_TYPE_STYLEBOX, p_name, theme_types);
theme_style_cache[p_theme_type][p_name] = style; theme_style_cache[p_theme_type][p_name] = style;
return style; return style;
@ -2197,8 +2197,8 @@ Ref<Font> Window::get_theme_font(const StringName &p_name, const StringName &p_t
return theme_font_cache[p_theme_type][p_name]; return theme_font_cache[p_theme_type][p_name];
} }
List<StringName> theme_types; Vector<StringName> theme_types;
theme_owner->get_theme_type_dependencies(this, p_theme_type, &theme_types); theme_owner->get_theme_type_dependencies(this, p_theme_type, theme_types);
Ref<Font> font = theme_owner->get_theme_item_in_types(Theme::DATA_TYPE_FONT, p_name, theme_types); Ref<Font> font = theme_owner->get_theme_item_in_types(Theme::DATA_TYPE_FONT, p_name, theme_types);
theme_font_cache[p_theme_type][p_name] = font; theme_font_cache[p_theme_type][p_name] = font;
return font; return font;
@ -2221,8 +2221,8 @@ int Window::get_theme_font_size(const StringName &p_name, const StringName &p_th
return theme_font_size_cache[p_theme_type][p_name]; return theme_font_size_cache[p_theme_type][p_name];
} }
List<StringName> theme_types; Vector<StringName> theme_types;
theme_owner->get_theme_type_dependencies(this, p_theme_type, &theme_types); theme_owner->get_theme_type_dependencies(this, p_theme_type, theme_types);
int font_size = theme_owner->get_theme_item_in_types(Theme::DATA_TYPE_FONT_SIZE, p_name, theme_types); int font_size = theme_owner->get_theme_item_in_types(Theme::DATA_TYPE_FONT_SIZE, p_name, theme_types);
theme_font_size_cache[p_theme_type][p_name] = font_size; theme_font_size_cache[p_theme_type][p_name] = font_size;
return font_size; return font_size;
@ -2245,8 +2245,8 @@ Color Window::get_theme_color(const StringName &p_name, const StringName &p_them
return theme_color_cache[p_theme_type][p_name]; return theme_color_cache[p_theme_type][p_name];
} }
List<StringName> theme_types; Vector<StringName> theme_types;
theme_owner->get_theme_type_dependencies(this, p_theme_type, &theme_types); theme_owner->get_theme_type_dependencies(this, p_theme_type, theme_types);
Color color = theme_owner->get_theme_item_in_types(Theme::DATA_TYPE_COLOR, p_name, theme_types); Color color = theme_owner->get_theme_item_in_types(Theme::DATA_TYPE_COLOR, p_name, theme_types);
theme_color_cache[p_theme_type][p_name] = color; theme_color_cache[p_theme_type][p_name] = color;
return color; return color;
@ -2269,8 +2269,8 @@ int Window::get_theme_constant(const StringName &p_name, const StringName &p_the
return theme_constant_cache[p_theme_type][p_name]; return theme_constant_cache[p_theme_type][p_name];
} }
List<StringName> theme_types; Vector<StringName> theme_types;
theme_owner->get_theme_type_dependencies(this, p_theme_type, &theme_types); theme_owner->get_theme_type_dependencies(this, p_theme_type, theme_types);
int constant = theme_owner->get_theme_item_in_types(Theme::DATA_TYPE_CONSTANT, p_name, theme_types); int constant = theme_owner->get_theme_item_in_types(Theme::DATA_TYPE_CONSTANT, p_name, theme_types);
theme_constant_cache[p_theme_type][p_name] = constant; theme_constant_cache[p_theme_type][p_name] = constant;
return constant; return constant;
@ -2315,8 +2315,8 @@ bool Window::has_theme_icon(const StringName &p_name, const StringName &p_theme_
} }
} }
List<StringName> theme_types; Vector<StringName> theme_types;
theme_owner->get_theme_type_dependencies(this, p_theme_type, &theme_types); theme_owner->get_theme_type_dependencies(this, p_theme_type, theme_types);
return theme_owner->has_theme_item_in_types(Theme::DATA_TYPE_ICON, p_name, theme_types); return theme_owner->has_theme_item_in_types(Theme::DATA_TYPE_ICON, p_name, theme_types);
} }
@ -2332,8 +2332,8 @@ bool Window::has_theme_stylebox(const StringName &p_name, const StringName &p_th
} }
} }
List<StringName> theme_types; Vector<StringName> theme_types;
theme_owner->get_theme_type_dependencies(this, p_theme_type, &theme_types); theme_owner->get_theme_type_dependencies(this, p_theme_type, theme_types);
return theme_owner->has_theme_item_in_types(Theme::DATA_TYPE_STYLEBOX, p_name, theme_types); return theme_owner->has_theme_item_in_types(Theme::DATA_TYPE_STYLEBOX, p_name, theme_types);
} }
@ -2349,8 +2349,8 @@ bool Window::has_theme_font(const StringName &p_name, const StringName &p_theme_
} }
} }
List<StringName> theme_types; Vector<StringName> theme_types;
theme_owner->get_theme_type_dependencies(this, p_theme_type, &theme_types); theme_owner->get_theme_type_dependencies(this, p_theme_type, theme_types);
return theme_owner->has_theme_item_in_types(Theme::DATA_TYPE_FONT, p_name, theme_types); return theme_owner->has_theme_item_in_types(Theme::DATA_TYPE_FONT, p_name, theme_types);
} }
@ -2366,8 +2366,8 @@ bool Window::has_theme_font_size(const StringName &p_name, const StringName &p_t
} }
} }
List<StringName> theme_types; Vector<StringName> theme_types;
theme_owner->get_theme_type_dependencies(this, p_theme_type, &theme_types); theme_owner->get_theme_type_dependencies(this, p_theme_type, theme_types);
return theme_owner->has_theme_item_in_types(Theme::DATA_TYPE_FONT_SIZE, p_name, theme_types); return theme_owner->has_theme_item_in_types(Theme::DATA_TYPE_FONT_SIZE, p_name, theme_types);
} }
@ -2383,8 +2383,8 @@ bool Window::has_theme_color(const StringName &p_name, const StringName &p_theme
} }
} }
List<StringName> theme_types; Vector<StringName> theme_types;
theme_owner->get_theme_type_dependencies(this, p_theme_type, &theme_types); theme_owner->get_theme_type_dependencies(this, p_theme_type, theme_types);
return theme_owner->has_theme_item_in_types(Theme::DATA_TYPE_COLOR, p_name, theme_types); return theme_owner->has_theme_item_in_types(Theme::DATA_TYPE_COLOR, p_name, theme_types);
} }
@ -2400,8 +2400,8 @@ bool Window::has_theme_constant(const StringName &p_name, const StringName &p_th
} }
} }
List<StringName> theme_types; Vector<StringName> theme_types;
theme_owner->get_theme_type_dependencies(this, p_theme_type, &theme_types); theme_owner->get_theme_type_dependencies(this, p_theme_type, theme_types);
return theme_owner->has_theme_item_in_types(Theme::DATA_TYPE_CONSTANT, p_name, theme_types); return theme_owner->has_theme_item_in_types(Theme::DATA_TYPE_CONSTANT, p_name, theme_types);
} }

8
scene/resources/3d/primitive_meshes.cpp
View File

@ -3476,13 +3476,13 @@ Ref<Font> TextMesh::_get_font_or_default() const {
} }
StringName theme_name = "font"; StringName theme_name = "font";
List<StringName> theme_types; Vector<StringName> theme_types;
ThemeDB::get_singleton()->get_native_type_dependencies(get_class_name(), &theme_types); ThemeDB::get_singleton()->get_native_type_dependencies(get_class_name(), theme_types);
ThemeContext *global_context = ThemeDB::get_singleton()->get_default_theme_context(); ThemeContext *global_context = ThemeDB::get_singleton()->get_default_theme_context();
List<Ref<Theme>> themes = global_context->get_themes(); Vector<Ref<Theme>> themes = global_context->get_themes();
if (Engine::get_singleton()->is_editor_hint()) { if (Engine::get_singleton()->is_editor_hint()) {
themes.push_front(ThemeDB::get_singleton()->get_project_theme()); themes.insert(0, ThemeDB::get_singleton()->get_project_theme());
} }
for (const Ref<Theme> &theme : themes) { for (const Ref<Theme> &theme : themes) {

12
scene/resources/font.cpp
View File

@ -2912,13 +2912,13 @@ Ref<Font> FontVariation::_get_base_font_or_default() const {
} }
StringName theme_name = "font"; StringName theme_name = "font";
List<StringName> theme_types; Vector<StringName> theme_types;
ThemeDB::get_singleton()->get_native_type_dependencies(get_class_name(), &theme_types); ThemeDB::get_singleton()->get_native_type_dependencies(get_class_name(), theme_types);
ThemeContext *global_context = ThemeDB::get_singleton()->get_default_theme_context(); ThemeContext *global_context = ThemeDB::get_singleton()->get_default_theme_context();
List<Ref<Theme>> themes = global_context->get_themes(); Vector<Ref<Theme>> themes = global_context->get_themes();
if (Engine::get_singleton()->is_editor_hint()) { if (Engine::get_singleton()->is_editor_hint()) {
themes.push_front(ThemeDB::get_singleton()->get_project_theme()); themes.insert(0, ThemeDB::get_singleton()->get_project_theme());
} }
for (const Ref<Theme> &theme : themes) { for (const Ref<Theme> &theme : themes) {
@ -3280,8 +3280,8 @@ Ref<Font> SystemFont::_get_base_font_or_default() const {
} }
StringName theme_name = "font"; StringName theme_name = "font";
List<StringName> theme_types; Vector<StringName> theme_types;
ThemeDB::get_singleton()->get_native_type_dependencies(get_class_name(), &theme_types); ThemeDB::get_singleton()->get_native_type_dependencies(get_class_name(), theme_types);
ThemeContext *global_context = ThemeDB::get_singleton()->get_default_theme_context(); ThemeContext *global_context = ThemeDB::get_singleton()->get_default_theme_context();
for (const Ref<Theme> &theme : global_context->get_themes()) { for (const Ref<Theme> &theme : global_context->get_themes()) {

8
scene/resources/theme.cpp
View File

@ -1250,14 +1250,12 @@ void Theme::get_type_list(List<StringName> *p_list) const {
} }
} }
void Theme::get_type_dependencies(const StringName &p_base_type, const StringName &p_type_variation, List<StringName> *p_list) { void Theme::get_type_dependencies(const StringName &p_base_type, const StringName &p_type_variation, Vector<StringName> &r_result) {
ERR_FAIL_NULL(p_list);
// Build the dependency chain for type variations. // Build the dependency chain for type variations.
if (p_type_variation != StringName()) { if (p_type_variation != StringName()) {
StringName variation_name = p_type_variation; StringName variation_name = p_type_variation;
while (variation_name != StringName()) { while (variation_name != StringName()) {
p_list->push_back(variation_name); r_result.push_back(variation_name);
variation_name = get_type_variation_base(variation_name); variation_name = get_type_variation_base(variation_name);
// If we have reached the base type dependency, it's safe to stop (assuming no funny business was done to the Theme). // If we have reached the base type dependency, it's safe to stop (assuming no funny business was done to the Theme).
@ -1268,7 +1266,7 @@ void Theme::get_type_dependencies(const StringName &p_base_type, const StringNam
} }
// Continue building the chain using native class hierarchy. // Continue building the chain using native class hierarchy.
ThemeDB::get_singleton()->get_native_type_dependencies(p_base_type, p_list); ThemeDB::get_singleton()->get_native_type_dependencies(p_base_type, r_result);
} }
// Internal methods for getting lists as a Vector of String (compatible with public API). // Internal methods for getting lists as a Vector of String (compatible with public API).

2
scene/resources/theme.h
View File

@ -216,7 +216,7 @@ public:
void add_type(const StringName &p_theme_type); void add_type(const StringName &p_theme_type);
void remove_type(const StringName &p_theme_type); void remove_type(const StringName &p_theme_type);
void get_type_list(List<StringName> *p_list) const; void get_type_list(List<StringName> *p_list) const;
void get_type_dependencies(const StringName &p_base_type, const StringName &p_type_variant, List<StringName> *p_list); void get_type_dependencies(const StringName &p_base_type, const StringName &p_type_variant, Vector<StringName> &r_result);
void merge_with(const Ref<Theme> &p_other); void merge_with(const Ref<Theme> &p_other);
void clear(); void clear();

24
scene/theme/theme_db.cpp
View File

@ -198,21 +198,21 @@ Ref<StyleBox> ThemeDB::get_fallback_stylebox() {
return fallback_stylebox; return fallback_stylebox;
} }
void ThemeDB::get_native_type_dependencies(const StringName &p_base_type, List<StringName> *p_list) { void ThemeDB::get_native_type_dependencies(const StringName &p_base_type, Vector<StringName> &r_result) {
ERR_FAIL_NULL(p_list); if (p_base_type == StringName()) {
return;
}
// TODO: It may make sense to stop at Control/Window, because their parent classes cannot be used in // TODO: It may make sense to stop at Control/Window, because their parent classes cannot be used in
// a meaningful way. // a meaningful way.
StringName class_name = p_base_type; if (!ClassDB::get_inheritance_chain_nocheck(p_base_type, r_result)) {
while (class_name != StringName()) { r_result.push_back(p_base_type);
p_list->push_back(class_name);
class_name = ClassDB::get_parent_class_nocheck(class_name);
} }
} }
// Global theme contexts. // Global theme contexts.
ThemeContext *ThemeDB::create_theme_context(Node *p_node, List<Ref<Theme>> &p_themes) { ThemeContext *ThemeDB::create_theme_context(Node *p_node, Vector<Ref<Theme>> &p_themes) {
ERR_FAIL_COND_V(!p_node->is_inside_tree(), nullptr); ERR_FAIL_COND_V(!p_node->is_inside_tree(), nullptr);
ERR_FAIL_COND_V(theme_contexts.has(p_node), nullptr); ERR_FAIL_COND_V(theme_contexts.has(p_node), nullptr);
ERR_FAIL_COND_V(p_themes.is_empty(), nullptr); ERR_FAIL_COND_V(p_themes.is_empty(), nullptr);
@ -270,7 +270,7 @@ void ThemeDB::_propagate_theme_context(Node *p_from_node, ThemeContext *p_contex
void ThemeDB::_init_default_theme_context() { void ThemeDB::_init_default_theme_context() {
default_theme_context = memnew(ThemeContext); default_theme_context = memnew(ThemeContext);
List<Ref<Theme>> themes; Vector<Ref<Theme>> themes;
// Only add the project theme to the default context when running projects. // Only add the project theme to the default context when running projects.
@ -365,7 +365,7 @@ void ThemeDB::update_class_instance_items(Node *p_instance) {
HashMap<StringName, HashMap<StringName, ThemeItemBind>>::Iterator E = theme_item_binds.find(class_name); HashMap<StringName, HashMap<StringName, ThemeItemBind>>::Iterator E = theme_item_binds.find(class_name);
if (E) { if (E) {
for (const KeyValue<StringName, ThemeItemBind> &F : E->value) { for (const KeyValue<StringName, ThemeItemBind> &F : E->value) {
F.value.setter(p_instance); F.value.setter(p_instance, F.value.item_name, F.value.type_name);
} }
} }
@ -475,7 +475,7 @@ void ThemeContext::_emit_changed() {
emit_signal(CoreStringName(changed)); emit_signal(CoreStringName(changed));
} }
void ThemeContext::set_themes(List<Ref<Theme>> &p_themes) { void ThemeContext::set_themes(Vector<Ref<Theme>> &p_themes) {
for (const Ref<Theme> &theme : themes) { for (const Ref<Theme> &theme : themes) {
theme->disconnect_changed(callable_mp(this, &ThemeContext::_emit_changed)); theme->disconnect_changed(callable_mp(this, &ThemeContext::_emit_changed));
} }
@ -494,7 +494,7 @@ void ThemeContext::set_themes(List<Ref<Theme>> &p_themes) {
_emit_changed(); _emit_changed();
} }
List<Ref<Theme>> ThemeContext::get_themes() const { const Vector<Ref<Theme>> ThemeContext::get_themes() const {
return themes; return themes;
} }
@ -504,7 +504,7 @@ Ref<Theme> ThemeContext::get_fallback_theme() const {
return ThemeDB::get_singleton()->get_default_theme(); return ThemeDB::get_singleton()->get_default_theme();
} }
return themes.back()->get(); return themes[themes.size() - 1];
} }
void ThemeContext::_bind_methods() { void ThemeContext::_bind_methods() {

45
scene/theme/theme_db.h
View File

@ -46,26 +46,29 @@ class ThemeContext;
// Macros for binding theme items of this class. This information is used for the documentation, theme // Macros for binding theme items of this class. This information is used for the documentation, theme
// overrides, etc. This is also the basis for theme cache. // overrides, etc. This is also the basis for theme cache.
#define BIND_THEME_ITEM(m_data_type, m_class, m_prop) \ #define BIND_THEME_ITEM(m_data_type, m_class, m_prop) \
ThemeDB::get_singleton()->bind_class_item(m_data_type, get_class_static(), #m_prop, #m_prop, [](Node *p_instance) { \ ThemeDB::get_singleton()->bind_class_item(m_data_type, get_class_static(), #m_prop, #m_prop, \
m_class *p_cast = Object::cast_to<m_class>(p_instance); \ [](Node *p_instance, const StringName &p_item_name, const StringName &p_type_name) { \
p_cast->theme_cache.m_prop = p_cast->get_theme_item(m_data_type, _scs_create(#m_prop)); \ m_class *p_cast = Object::cast_to<m_class>(p_instance); \
}) p_cast->theme_cache.m_prop = p_cast->get_theme_item(m_data_type, p_item_name, p_type_name); \
})
#define BIND_THEME_ITEM_CUSTOM(m_data_type, m_class, m_prop, m_item_name) \ #define BIND_THEME_ITEM_CUSTOM(m_data_type, m_class, m_prop, m_item_name) \
ThemeDB::get_singleton()->bind_class_item(m_data_type, get_class_static(), #m_prop, m_item_name, [](Node *p_instance) { \ ThemeDB::get_singleton()->bind_class_item(m_data_type, get_class_static(), #m_prop, m_item_name, \
m_class *p_cast = Object::cast_to<m_class>(p_instance); \ [](Node *p_instance, const StringName &p_item_name, const StringName &p_type_name) { \
p_cast->theme_cache.m_prop = p_cast->get_theme_item(m_data_type, _scs_create(m_item_name)); \ m_class *p_cast = Object::cast_to<m_class>(p_instance); \
}) p_cast->theme_cache.m_prop = p_cast->get_theme_item(m_data_type, p_item_name, p_type_name); \
})
// Macro for binding theme items used by this class, but defined/binded by other classes. This is primarily used for // Macro for binding theme items used by this class, but defined/binded by other classes. This is primarily used for
// the theme cache. Can also be used to list such items in documentation. // the theme cache. Can also be used to list such items in documentation.
#define BIND_THEME_ITEM_EXT(m_data_type, m_class, m_prop, m_item_name, m_type_name) \ #define BIND_THEME_ITEM_EXT(m_data_type, m_class, m_prop, m_item_name, m_type_name) \
ThemeDB::get_singleton()->bind_class_external_item(m_data_type, get_class_static(), #m_prop, m_item_name, m_type_name, [](Node *p_instance) { \ ThemeDB::get_singleton()->bind_class_external_item(m_data_type, get_class_static(), #m_prop, m_item_name, m_type_name, \
m_class *p_cast = Object::cast_to<m_class>(p_instance); \ [](Node *p_instance, const StringName &p_item_name, const StringName &p_type_name) { \
p_cast->theme_cache.m_prop = p_cast->get_theme_item(m_data_type, _scs_create(m_item_name), _scs_create(m_type_name)); \ m_class *p_cast = Object::cast_to<m_class>(p_instance); \
}) p_cast->theme_cache.m_prop = p_cast->get_theme_item(m_data_type, p_item_name, p_type_name); \
})
class ThemeDB : public Object { class ThemeDB : public Object {
GDCLASS(ThemeDB, Object); GDCLASS(ThemeDB, Object);
@ -97,7 +100,7 @@ class ThemeDB : public Object {
// Binding of theme items to Node classes. // Binding of theme items to Node classes.
public: public:
typedef std::function<void(Node *)> ThemeItemSetter; typedef std::function<void(Node *, const StringName &, const StringName &)> ThemeItemSetter;
struct ThemeItemBind { struct ThemeItemBind {
Theme::DataType data_type; Theme::DataType data_type;
@ -154,11 +157,11 @@ public:
void set_fallback_stylebox(const Ref<StyleBox> &p_stylebox); void set_fallback_stylebox(const Ref<StyleBox> &p_stylebox);
Ref<StyleBox> get_fallback_stylebox(); Ref<StyleBox> get_fallback_stylebox();
void get_native_type_dependencies(const StringName &p_base_type, List<StringName> *p_list); void get_native_type_dependencies(const StringName &p_base_type, Vector<StringName> &r_result);
// Global theme contexts. // Global theme contexts.
ThemeContext *create_theme_context(Node *p_node, List<Ref<Theme>> &p_themes); ThemeContext *create_theme_context(Node *p_node, Vector<Ref<Theme>> &p_themes);
void destroy_theme_context(Node *p_node); void destroy_theme_context(Node *p_node);
ThemeContext *get_theme_context(Node *p_node) const; ThemeContext *get_theme_context(Node *p_node) const;
@ -191,7 +194,7 @@ class ThemeContext : public Object {
// Themes are stacked in the order of relevance, for easy iteration. // Themes are stacked in the order of relevance, for easy iteration.
// This means that the first theme is the one you should check first, // This means that the first theme is the one you should check first,
// and the last theme is the fallback theme where every lookup ends. // and the last theme is the fallback theme where every lookup ends.
List<Ref<Theme>> themes; Vector<Ref<Theme>> themes;
void _emit_changed(); void _emit_changed();
@ -199,8 +202,8 @@ protected:
static void _bind_methods(); static void _bind_methods();
public: public:
void set_themes(List<Ref<Theme>> &p_themes); void set_themes(Vector<Ref<Theme>> &p_themes);
List<Ref<Theme>> get_themes() const; const Vector<Ref<Theme>> get_themes() const;
Ref<Theme> get_fallback_theme() const; Ref<Theme> get_fallback_theme() const;
}; };

14
scene/theme/theme_owner.cpp
View File

@ -199,7 +199,7 @@ void ThemeOwner::propagate_theme_changed(Node *p_to_node, Node *p_owner_node, bo
// Theme lookup. // Theme lookup.
void ThemeOwner::get_theme_type_dependencies(const Node *p_for_node, const StringName &p_theme_type, List<StringName> *r_list) const { void ThemeOwner::get_theme_type_dependencies(const Node *p_for_node, const StringName &p_theme_type, Vector<StringName> &r_result) const {
const Control *for_c = Object::cast_to<Control>(p_for_node); const Control *for_c = Object::cast_to<Control>(p_for_node);
const Window *for_w = Object::cast_to<Window>(p_for_node); const Window *for_w = Object::cast_to<Window>(p_for_node);
ERR_FAIL_COND_MSG(!for_c && !for_w, "Only Control and Window nodes and derivatives can be polled for theming."); ERR_FAIL_COND_MSG(!for_c && !for_w, "Only Control and Window nodes and derivatives can be polled for theming.");
@ -224,7 +224,7 @@ void ThemeOwner::get_theme_type_dependencies(const Node *p_for_node, const Strin
while (owner_node) { while (owner_node) {
Ref<Theme> owner_theme = _get_owner_node_theme(owner_node); Ref<Theme> owner_theme = _get_owner_node_theme(owner_node);
if (owner_theme.is_valid() && owner_theme->get_type_variation_base(type_variation) != StringName()) { if (owner_theme.is_valid() && owner_theme->get_type_variation_base(type_variation) != StringName()) {
owner_theme->get_type_dependencies(type_name, type_variation, r_list); owner_theme->get_type_dependencies(type_name, type_variation, r_result);
return; return;
} }
@ -235,21 +235,21 @@ void ThemeOwner::get_theme_type_dependencies(const Node *p_for_node, const Strin
ThemeContext *global_context = _get_active_owner_context(); ThemeContext *global_context = _get_active_owner_context();
for (const Ref<Theme> &theme : global_context->get_themes()) { for (const Ref<Theme> &theme : global_context->get_themes()) {
if (theme.is_valid() && theme->get_type_variation_base(type_variation) != StringName()) { if (theme.is_valid() && theme->get_type_variation_base(type_variation) != StringName()) {
theme->get_type_dependencies(type_name, type_variation, r_list); theme->get_type_dependencies(type_name, type_variation, r_result);
return; return;
} }
} }
// If nothing was found, get the native dependencies for the current class. // If nothing was found, get the native dependencies for the current class.
ThemeDB::get_singleton()->get_native_type_dependencies(type_name, r_list); ThemeDB::get_singleton()->get_native_type_dependencies(type_name, r_result);
return; return;
} }
// Otherwise, get the native dependencies for the provided theme type. // Otherwise, get the native dependencies for the provided theme type.
ThemeDB::get_singleton()->get_native_type_dependencies(p_theme_type, r_list); ThemeDB::get_singleton()->get_native_type_dependencies(p_theme_type, r_result);
} }
Variant ThemeOwner::get_theme_item_in_types(Theme::DataType p_data_type, const StringName &p_name, const List<StringName> &p_theme_types) { Variant ThemeOwner::get_theme_item_in_types(Theme::DataType p_data_type, const StringName &p_name, const Vector<StringName> &p_theme_types) {
ERR_FAIL_COND_V_MSG(p_theme_types.is_empty(), Variant(), "At least one theme type must be specified."); ERR_FAIL_COND_V_MSG(p_theme_types.is_empty(), Variant(), "At least one theme type must be specified.");
// First, look through each control or window node in the branch, until no valid parent can be found. // First, look through each control or window node in the branch, until no valid parent can be found.
@ -285,7 +285,7 @@ Variant ThemeOwner::get_theme_item_in_types(Theme::DataType p_data_type, const S
return global_context->get_fallback_theme()->get_theme_item(p_data_type, p_name, StringName()); return global_context->get_fallback_theme()->get_theme_item(p_data_type, p_name, StringName());
} }
bool ThemeOwner::has_theme_item_in_types(Theme::DataType p_data_type, const StringName &p_name, const List<StringName> &p_theme_types) { bool ThemeOwner::has_theme_item_in_types(Theme::DataType p_data_type, const StringName &p_name, const Vector<StringName> &p_theme_types) {
ERR_FAIL_COND_V_MSG(p_theme_types.is_empty(), false, "At least one theme type must be specified."); ERR_FAIL_COND_V_MSG(p_theme_types.is_empty(), false, "At least one theme type must be specified.");
// First, look through each control or window node in the branch, until no valid parent can be found. // First, look through each control or window node in the branch, until no valid parent can be found.

6
scene/theme/theme_owner.h
View File

@ -69,10 +69,10 @@ public:
// Theme lookup. // Theme lookup.
void get_theme_type_dependencies(const Node *p_for_node, const StringName &p_theme_type, List<StringName> *r_list) const; void get_theme_type_dependencies(const Node *p_for_node, const StringName &p_theme_type, Vector<StringName> &r_result) const;
Variant get_theme_item_in_types(Theme::DataType p_data_type, const StringName &p_name, const List<StringName> &p_theme_types); Variant get_theme_item_in_types(Theme::DataType p_data_type, const StringName &p_name, const Vector<StringName> &p_theme_types);
bool has_theme_item_in_types(Theme::DataType p_data_type, const StringName &p_name, const List<StringName> &p_theme_types); bool has_theme_item_in_types(Theme::DataType p_data_type, const StringName &p_name, const Vector<StringName> &p_theme_types);
float get_theme_default_base_scale(); float get_theme_default_base_scale();
Ref<Font> get_theme_default_font(); Ref<Font> get_theme_default_font();