asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #90446 from aaronp64/theme_override_tooltips

Browse source 
Fix `theme_override` tooltip caching
This commit is contained in:
Rémi Verschelde 2024-04-17 10:58:36 +02:00
commit dffa8b1712
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
editor/editor_inspector.cpp
View file

@ -3220,12 +3220,13 @@ void EditorInspector::update_tree() {
}
// Search for the doc path in the cache.
HashMap<StringName, HashMap<StringName, String>>::Iterator E = doc_path_cache.find(classname);
HashMap<StringName, HashMap<StringName, DocCacheInfo>>::Iterator E = doc_cache.find(classname);
if (E) {
HashMap<StringName, String>::Iterator F = E->value.find(propname);
HashMap<StringName, DocCacheInfo>::Iterator F = E->value.find(propname);
if (F) {
found = true;
doc_path = F->value;
doc_path = F->value.doc_path;
theme_item_name = F->value.theme_item_name;
}
}
@ -3246,23 +3247,22 @@ void EditorInspector::update_tree() {
theme_item_name = F->value.theme_properties[i].name;
}
}
if (is_native_class) {
doc_path_cache[classname][propname] = doc_path;
}
} else {
for (int i = 0; i < F->value.properties.size(); i++) {
String doc_path_current = "class_property:" + F->value.name + ":" + F->value.properties[i].name;
if (F->value.properties[i].name == propname.operator String()) {
doc_path = doc_path_current;
}
if (is_native_class) {
doc_path_cache[classname][propname] = doc_path;
}
}
}
if (is_native_class) {
DocCacheInfo cache_info;
cache_info.doc_path = doc_path;
cache_info.theme_item_name = theme_item_name;
doc_cache[classname][propname] = cache_info;
}
if (!doc_path.is_empty() || F->value.inherits.is_empty()) {
break;
}

7
editor/editor_inspector.h
View file

@ -505,7 +505,12 @@ class EditorInspector : public ScrollContainer {
int property_focusable;
int update_scroll_request;
HashMap<StringName, HashMap<StringName, String>> doc_path_cache;
struct DocCacheInfo {
String doc_path;
String theme_item_name;
};
HashMap<StringName, HashMap<StringName, DocCacheInfo>> doc_cache;
HashSet<StringName> restart_request_props;
HashMap<String, String> custom_property_descriptions;