Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-10 22:23:07 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #65389 from Rindbee/fix-file-list-in-FileDialog-not-updating

Browse Source 
Fix file list in FileDialog not updating on first run
This commit is contained in:
Rémi Verschelde 2022-09-07 17:53:09 +02:00
commit 54942038ac
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
editor/editor_file_dialog.cpp
View File

@ -145,6 +145,8 @@ void EditorFileDialog::_notification(int p_what) {
if (!is_visible()) {
set_process_shortcut_input(false);
}
invalidate(); // For consistency with the standard FileDialog.
} break;
case NOTIFICATION_WM_WINDOW_FOCUS_IN: {
@ -304,10 +306,6 @@ void EditorFileDialog::_post_popup() {
}
set_current_dir(current);
if (invalidated) {
update_file_list();
invalidated = false;
}
if (mode == FILE_MODE_SAVE_FILE) {
file->grab_focus();
} else {
@ -320,19 +318,13 @@ void EditorFileDialog::_post_popup() {
file_box->set_visible(true);
}
if (is_visible() && !get_current_file().is_empty()) {
if (!get_current_file().is_empty()) {
_request_single_thumbnail(get_current_dir().path_join(get_current_file()));
}
if (is_visible()) {
_update_recent();
local_history.clear();
local_history_pos = -1;
_push_history();
_update_favorites();
}
local_history.clear();
local_history_pos = -1;
_push_history();
set_process_shortcut_input(true);
}

6
scene/gui/file_dialog.cpp
View File

@ -87,6 +87,8 @@ void FileDialog::_notification(int p_what) {
if (!is_visible()) {
set_process_shortcut_input(false);
}
invalidate(); // Put it here to preview in the editor.
} break;
case NOTIFICATION_THEME_CHANGED: {
@ -223,10 +225,6 @@ void FileDialog::_save_confirm_pressed() {
void FileDialog::_post_popup() {
ConfirmationDialog::_post_popup();
if (invalidated) {
update_file_list();
invalidated = false;
}
if (mode == FILE_MODE_SAVE_FILE) {
file->grab_focus();
} else {