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

Merge pull request #82537 from KoBeWi/the_files_are_back_on_the_menu 

Don't remove favorite files in EditorFileDialog
This commit is contained in:
Rémi Verschelde 2023-10-18 16:55:06 +02:00
parent f7da96add3 825a18e980
commit 7f884b4e00
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
editor/gui/editor_file_dialog.cpp
View File

@ -1393,12 +1393,14 @@ void EditorFileDialog::_update_favorites() {
bool fav_changed = false;
int current_favorite = -1;
for (int i = 0; i < favorited.size(); i++) {
bool cres = favorited[i].begins_with("res://");
if (cres != res) {
String name = favorited[i];
bool cres = name.begins_with("res://");
if (cres != res || !name.ends_with("/")) {
continue;
}
if (!dir_access->dir_exists(favorited[i])) {
if (!dir_access->dir_exists(name)) {
// Remove invalid directory from the list of Favorited directories.
favorited.remove_at(i--);
fav_changed = true;
@ -1406,7 +1408,6 @@ void EditorFileDialog::_update_favorites() {
}
// Compute favorite display text.
String name = favorited[i];
if (res && name == "res://") {
if (name == current) {
current_favorite = favorited_paths.size();
@ -1414,7 +1415,7 @@ void EditorFileDialog::_update_favorites() {
name = "/";
favorited_paths.append(favorited[i]);
favorited_names.append(name);
} else if (name.ends_with("/")) {
} else {
if (name == current || name == current + "/") {
current_favorite = favorited_paths.size();
}
@ -1422,8 +1423,6 @@ void EditorFileDialog::_update_favorites() {
name = name.get_file();
favorited_paths.append(favorited[i]);
favorited_names.append(name);
} else {
// Ignore favorited files.
}
}