diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-10-03 17:13:58 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-10-03 17:13:58 +0200 |
| commit | 31dbbc2c5ac406d8d44655fd7a39f22ace958da0 (patch) | |
| tree | 83089e357f4bf313e347dd393da095d815446cdc /platform/linuxbsd/x11/display_server_x11.cpp | |
| parent | cb4879a876fa01b42495af09174d315588e37317 (diff) | |
| parent | 2e1f48ff6e52a124fdd513d4cace0ec56147df72 (diff) | |
| download | redot-engine-31dbbc2c5ac406d8d44655fd7a39f22ace958da0.tar.gz | |
Merge pull request #80952 from bruvzg/nfdlg_refocus
[Native File Dialogs] Refocus last focused window on close.
Diffstat (limited to 'platform/linuxbsd/x11/display_server_x11.cpp')
| -rw-r--r-- | platform/linuxbsd/x11/display_server_x11.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/linuxbsd/x11/display_server_x11.cpp b/platform/linuxbsd/x11/display_server_x11.cpp index 897a6438d2..678ec340c0 100644 --- a/platform/linuxbsd/x11/display_server_x11.cpp +++ b/platform/linuxbsd/x11/display_server_x11.cpp @@ -364,14 +364,14 @@ bool DisplayServerX11::is_dark_mode() const { } Error DisplayServerX11::file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback) { - WindowID window_id = _get_focused_window_or_popup(); + WindowID window_id = last_focused_window; if (!windows.has(window_id)) { window_id = MAIN_WINDOW_ID; } String xid = vformat("x11:%x", (uint64_t)windows[window_id].x11_window); - return portal_desktop->file_dialog_show(xid, p_title, p_current_directory, p_filename, p_mode, p_filters, p_callback); + return portal_desktop->file_dialog_show(last_focused_window, xid, p_title, p_current_directory, p_filename, p_mode, p_filters, p_callback); } #endif |