Skip to content

Commit

Permalink
[Windows] Emit native file dialog callback from event loop, fix selec…
Browse files Browse the repository at this point in the history 
…ted options not saved.
  • Loading branch information
@bruvzg
bruvzg committed Aug 23, 2024
1 parent 568589c commit ea25267
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 51 deletions.
3 changes: 2 additions & 1 deletion editor/gui/editor_file_dialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ void EditorFileDialog::_native_dialog_cb(bool p_ok, const Vector<String> &p_file
file_name = ProjectSettings::get_singleton()->localize_path(file_name);
}
}
selected_options = p_selected_options;

String f = files[0];
if (mode == FILE_MODE_OPEN_FILES) {
emit_signal(SNAME("files_selected"), files);
Expand Down Expand Up @@ -146,7 +148,6 @@ void EditorFileDialog::_native_dialog_cb(bool p_ok, const Vector<String> &p_file
}
file->set_text(f);
dir->set_text(f.get_base_dir());
selected_options = p_selected_options;
filter->select(p_filter);
}

Expand Down
106 changes: 57 additions & 49 deletions platform/windows/display_server_windows.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ void DisplayServerWindows::_thread_fd_monitor(void *p_ud) {
if (!item.has("name") || !item.has("values") || !item.has("default")) {
continue;
}
event_handler->add_option(pfdc, item["name"], item["values"], item["default_idx"]);
event_handler->add_option(pfdc, item["name"], item["values"], item["default"]);
}
event_handler->set_root(fd->root);

Expand Down Expand Up @@ -603,62 +603,41 @@ void DisplayServerWindows::_thread_fd_monitor(void *p_ud) {
}
}
if (fd->callback.is_valid()) {
if (fd->options_in_cb) {
Variant v_result = true;
Variant v_files = file_names;
Variant v_index = index;
Variant v_opt = options;
const Variant *cb_args[4] = { &v_result, &v_files, &v_index, &v_opt };

fd->callback.call_deferredp(cb_args, 4);
} else {
Variant v_result = true;
Variant v_files = file_names;
Variant v_index = index;
const Variant *cb_args[3] = { &v_result, &v_files, &v_index };

fd->callback.call_deferredp(cb_args, 3);
}
MutexLock lock(ds->file_dialog_mutex);
FileDialogCallback cb;
cb.callback = fd->callback;
cb.status = true;
cb.files = file_names;
cb.index = index;
cb.options = options;
cb.opt_in_cb = fd->options_in_cb;
ds->pending_cbs.push_back(cb);
}
} else {
if (fd->callback.is_valid()) {
if (fd->options_in_cb) {
Variant v_result = false;
Variant v_files = Vector<String>();
Variant v_index = 0;
Variant v_opt = Dictionary();
const Variant *cb_args[4] = { &v_result, &v_files, &v_index, &v_opt };

fd->callback.call_deferredp(cb_args, 4);
} else {
Variant v_result = false;
Variant v_files = Vector<String>();
Variant v_index = 0;
const Variant *cb_args[3] = { &v_result, &v_files, &v_index };

fd->callback.call_deferredp(cb_args, 3);
}
MutexLock lock(ds->file_dialog_mutex);
FileDialogCallback cb;
cb.callback = fd->callback;
cb.status = false;
cb.files = Vector<String>();
cb.index = index;
cb.options = options;
cb.opt_in_cb = fd->options_in_cb;
ds->pending_cbs.push_back(cb);
}
}
pfd->Release();
} else {
if (fd->callback.is_valid()) {
if (fd->options_in_cb) {
Variant v_result = false;
Variant v_files = Vector<String>();
Variant v_index = 0;
Variant v_opt = Dictionary();
const Variant *cb_args[4] = { &v_result, &v_files, &v_index, &v_opt };

fd->callback.call_deferredp(cb_args, 4);
} else {
Variant v_result = false;
Variant v_files = Vector<String>();
Variant v_index = 0;
const Variant *cb_args[3] = { &v_result, &v_files, &v_index };

fd->callback.call_deferredp(cb_args, 3);
}
MutexLock lock(ds->file_dialog_mutex);
FileDialogCallback cb;
cb.callback = fd->callback;
cb.status = false;
cb.files = Vector<String>();
cb.index = 0;
cb.options = Dictionary();
cb.opt_in_cb = fd->options_in_cb;
ds->pending_cbs.push_back(cb);
}
}
{
Expand Down Expand Up @@ -746,6 +725,34 @@ Error DisplayServerWindows::_file_dialog_with_options_show(const String &p_title
return OK;
}

void DisplayServerWindows::process_file_dialog_callbacks() {
MutexLock lock(file_dialog_mutex);
while (!pending_cbs.is_empty()) {
FileDialogCallback cb = pending_cbs.front()->get();
pending_cbs.pop_front();

if (cb.opt_in_cb) {
Variant ret;
Callable::CallError ce;
const Variant *args[4] = { &cb.status, &cb.files, &cb.index, &cb.options };

cb.callback.callp(args, 4, ret, ce);
if (ce.error != Callable::CallError::CALL_OK) {
ERR_PRINT(vformat("Failed to execute file dialog callback: %s.", Variant::get_callable_error_text(cb.callback, args, 4, ce)));
}
} else {
Variant ret;
Callable::CallError ce;
const Variant *args[3] = { &cb.status, &cb.files, &cb.index };

cb.callback.callp(args, 3, ret, ce);
if (ce.error != Callable::CallError::CALL_OK) {
ERR_PRINT(vformat("Failed to execute file dialog callback: %s.", Variant::get_callable_error_text(cb.callback, args, 3, ce)));
}
}
}
}

void DisplayServerWindows::mouse_set_mode(MouseMode p_mode) {
_THREAD_SAFE_METHOD_

Expand Down Expand Up @@ -3168,6 +3175,7 @@ void DisplayServerWindows::process_events() {
memdelete(E->get());
E->erase();
}
process_file_dialog_callbacks();
}

void DisplayServerWindows::force_process_and_drop_events() {
Expand Down
10 changes: 10 additions & 0 deletions platform/windows/display_server_windows.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,16 @@ class DisplayServerWindows : public DisplayServer {
Mutex file_dialog_mutex;
List<FileDialogData *> file_dialogs;
HashMap<HWND, FileDialogData *> file_dialog_wnd;
struct FileDialogCallback {
Callable callback;
Variant status;
Variant files;
Variant index;
Variant options;
bool opt_in_cb = false;
};
List<FileDialogCallback> pending_cbs;
void process_file_dialog_callbacks();

static void _thread_fd_monitor(void *p_ud);

Expand Down
3 changes: 2 additions & 1 deletion scene/gui/file_dialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ void FileDialog::_native_dialog_cb(bool p_ok, const Vector<String> &p_files, int
file_name = ProjectSettings::get_singleton()->localize_path(file_name);
}
}
selected_options = p_selected_options;

String f = files[0];
if (mode == FILE_MODE_OPEN_FILES) {
emit_signal(SNAME("files_selected"), files);
Expand Down Expand Up @@ -155,7 +157,6 @@ void FileDialog::_native_dialog_cb(bool p_ok, const Vector<String> &p_files, int
}
file->set_text(f);
dir->set_text(f.get_base_dir());
selected_options = p_selected_options;
filter->select(p_filter);
}

Expand Down

0 comments on commit ea25267

Please sign in to comment.