Skip to content

Commit 9706b4e

Browse files
committed
Merge pull request #113564 from MattiaZir/fix-project-import-error-parent-child
Fix signal order for directory selection in `file_dialog`
2 parents 3135a40 + 98ccfb0 commit 9706b4e

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

scene/gui/file_dialog.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -372,8 +372,8 @@ void FileDialog::_save_confirm_pressed() {
372372
_save_to_recent();
373373

374374
String f = dir_access->get_current_dir().path_join(filename_edit->get_text());
375-
emit_signal(SNAME("file_selected"), f);
376375
hide();
376+
emit_signal(SNAME("file_selected"), f);
377377
}
378378

379379
void FileDialog::_post_popup() {
@@ -413,8 +413,8 @@ void FileDialog::_action_pressed() {
413413
const Vector<String> files = get_selected_files();
414414
if (!files.is_empty()) {
415415
_save_to_recent();
416-
emit_signal(SNAME("files_selected"), files);
417416
hide();
417+
emit_signal(SNAME("files_selected"), files);
418418
}
419419
return;
420420
}
@@ -424,8 +424,8 @@ void FileDialog::_action_pressed() {
424424

425425
if ((mode == FILE_MODE_OPEN_ANY || mode == FILE_MODE_OPEN_FILE) && (dir_access->file_exists(f) || dir_access->is_bundle(f))) {
426426
_save_to_recent();
427-
emit_signal(SNAME("file_selected"), f);
428427
hide();
428+
emit_signal(SNAME("file_selected"), f);
429429
} else if (mode == FILE_MODE_OPEN_ANY || mode == FILE_MODE_OPEN_DIR) {
430430
String path = dir_access->get_current_dir();
431431

@@ -439,8 +439,8 @@ void FileDialog::_action_pressed() {
439439
}
440440

441441
_save_to_recent();
442-
emit_signal(SNAME("dir_selected"), path);
443442
hide();
443+
emit_signal(SNAME("dir_selected"), path);
444444
}
445445

446446
if (mode == FILE_MODE_SAVE_FILE) {
@@ -501,15 +501,14 @@ void FileDialog::_action_pressed() {
501501
confirm_save->popup_centered(Size2(250, 80));
502502
} else {
503503
_save_to_recent();
504-
emit_signal(SNAME("file_selected"), f);
505504
hide();
505+
emit_signal(SNAME("file_selected"), f);
506506
}
507507
}
508508
}
509509

510510
void FileDialog::_cancel_pressed() {
511511
filename_edit->set_text("");
512-
invalidate();
513512
hide();
514513
}
515514

0 commit comments

Comments
 (0)