godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-18 14:21:41 +00:00
Code Releases Wiki Activity

Cleanup QuickOpenDialog history and fix UID errors

Browse Source
This commit is contained in:
kobewi
2025-04-03 15:31:36 +02:00
parent 1f56d96cf2
commit fb2e9c7ba7
1 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
editor/gui/editor_quick_open_dialog.cpp
View File

@@ -343,18 +343,31 @@ void QuickOpenResultContainer::init(const Vector<StringName> &p_base_types) {
// Load history when opening for the first time. // Load history when opening for the first time.
file_type_icons.insert(SNAME("__default_icon"), get_editor_theme_icon(SNAME("Object"))); file_type_icons.insert(SNAME("__default_icon"), get_editor_theme_icon(SNAME("Object")));
bool history_modified = false;
List<String> history_keys; List<String> history_keys;
history_file->get_section_keys("selected_history", &history_keys); history_file->get_section_keys("selected_history", &history_keys);
for (const String &type : history_keys) { for (const String &type : history_keys) {
const StringName type_name = type; const StringName type_name = type;
const PackedStringArray paths = history_file->get_value("selected_history", type); const PackedStringArray paths = history_file->get_value("selected_history", type);
PackedStringArray cleaned_paths;
cleaned_paths.resize(paths.size());
Vector<QuickOpenResultCandidate> loaded_candidates; Vector<QuickOpenResultCandidate> loaded_candidates;
loaded_candidates.resize(paths.size()); loaded_candidates.resize(paths.size());
{ {
QuickOpenResultCandidate *candidates_write = loaded_candidates.ptrw(); QuickOpenResultCandidate *candidates_write = loaded_candidates.ptrw();
String *cleanup_write = cleaned_paths.ptrw();
int i = 0; int i = 0;
for (const String &path : paths) { for (String path : paths) {
if (path.begins_with("uid://")) {
ResourceUID::ID id = ResourceUID::get_singleton()->text_to_id(path);
if (!ResourceUID::get_singleton()->has_id(id)) {
continue;
}
path = ResourceUID::get_singleton()->get_id_path(id);
}
if (!ResourceLoader::exists(path)) { if (!ResourceLoader::exists(path)) {
continue; continue;
} }
@@ -363,13 +376,29 @@ void QuickOpenResultContainer::init(const Vector<StringName> &p_base_types) {
QuickOpenResultCandidate candidate; QuickOpenResultCandidate candidate;
_setup_candidate(candidate, path); _setup_candidate(candidate, path);
candidates_write[i] = candidate; candidates_write[i] = candidate;
cleanup_write[i] = path;
i++; i++;
} }
loaded_candidates.resize(i); loaded_candidates.resize(i);
cleaned_paths.resize(i);
selected_history.insert(type, loaded_candidates); selected_history.insert(type, loaded_candidates);
if (i < paths.size()) {
// Some paths removed, need to update history.
if (i == 0) {
history_file->erase_section_key("selected_history", type);
} else {
history_file->set_value("selected_history", type, cleaned_paths);
}
history_modified = true;
}
} }
} }
if (history_modified) {
history_file->save(_get_cache_file_path());
}
} }
_create_initial_results(); _create_initial_results();
} }