Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-07 05:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #113564 from MattiaZir/fix-project-import-error-parent-child

Browse source 
Fix signal order for directory selection in `file_dialog`
This commit is contained in:
Rémi Verschelde 2025-12-05 12:55:57 +01:00
commit 9706b4e53a
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
scene/gui/file_dialog.cpp
View file

@ -372,8 +372,8 @@ void FileDialog::_save_confirm_pressed() {
_save_to_recent();
String f = dir_access->get_current_dir().path_join(filename_edit->get_text());
emit_signal(SNAME("file_selected"), f);
hide();
emit_signal(SNAME("file_selected"), f);
}
void FileDialog::_post_popup() {
@ -413,8 +413,8 @@ void FileDialog::_action_pressed() {
const Vector<String> files = get_selected_files();
if (!files.is_empty()) {
_save_to_recent();
emit_signal(SNAME("files_selected"), files);
hide();
emit_signal(SNAME("files_selected"), files);
}
return;
}
@ -424,8 +424,8 @@ void FileDialog::_action_pressed() {
if ((mode == FILE_MODE_OPEN_ANY || mode == FILE_MODE_OPEN_FILE) && (dir_access->file_exists(f) || dir_access->is_bundle(f))) {
_save_to_recent();
emit_signal(SNAME("file_selected"), f);
hide();
emit_signal(SNAME("file_selected"), f);
} else if (mode == FILE_MODE_OPEN_ANY || mode == FILE_MODE_OPEN_DIR) {
String path = dir_access->get_current_dir();
@ -439,8 +439,8 @@ void FileDialog::_action_pressed() {
}
_save_to_recent();
emit_signal(SNAME("dir_selected"), path);
hide();
emit_signal(SNAME("dir_selected"), path);
}
if (mode == FILE_MODE_SAVE_FILE) {
@ -501,15 +501,14 @@ void FileDialog::_action_pressed() {
confirm_save->popup_centered(Size2(250, 80));
} else {
_save_to_recent();
emit_signal(SNAME("file_selected"), f);
hide();
emit_signal(SNAME("file_selected"), f);
}
}
}
void FileDialog::_cancel_pressed() {
filename_edit->set_text("");
invalidate();
hide();
}