Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #103815 from bruvzg/x11_fd_cond

Browse source 
[X11] Fix native dialog parent selection condition.
This commit is contained in:
Rémi Verschelde 2025-03-14 00:08:45 +01:00
commit 28451c001a
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
platform/linuxbsd/x11/display_server_x11.cpp
View file

@ -405,7 +405,7 @@ void DisplayServerX11::set_system_theme_change_callback(const Callable &p_callab
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 p_window_id) {
WindowID window_id = p_window_id;
if (!windows.has(window_id) && !windows[window_id].is_popup) {
if (!windows.has(window_id) || windows[window_id].is_popup) {
window_id = MAIN_WINDOW_ID;
}
@ -416,7 +416,7 @@ Error DisplayServerX11::file_dialog_show(const String &p_title, const String &p_
Error DisplayServerX11::file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, WindowID p_window_id) {
WindowID window_id = p_window_id;
if (!windows.has(window_id) && !windows[window_id].is_popup) {
if (!windows.has(window_id) || windows[window_id].is_popup) {
window_id = MAIN_WINDOW_ID;
}