seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Floating Window request close when a dialog is opened

Browse Source
This commit is contained in:
Hilderin
2025-02-05 19:51:30 -05:00
parent a63a8b430b
commit a3d03717c0
9 changed files with 50 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
platform/linuxbsd/x11/display_server_x11.cpp
View File

@ -5926,7 +5926,7 @@ Error DisplayServerX11::embed_process(WindowID p_window, OS::ProcessID p_pid, co
return OK;
}
Error DisplayServerX11::remove_embedded_process(OS::ProcessID p_pid) {
Error DisplayServerX11::request_close_embedded_process(OS::ProcessID p_pid) {
_THREAD_SAFE_METHOD_
if (!embedded_processes.has(p_pid)) {
@ -5956,6 +5956,20 @@ Error DisplayServerX11::remove_embedded_process(OS::ProcessID p_pid) {
// Restore default error handler.
XSetErrorHandler(oldHandler);
return OK;
}
Error DisplayServerX11::remove_embedded_process(OS::ProcessID p_pid) {
_THREAD_SAFE_METHOD_
if (!embedded_processes.has(p_pid)) {
return ERR_DOES_NOT_EXIST;
}
EmbeddedProcessData *ep = embedded_processes.get(p_pid);
request_close_embedded_process(p_pid);
embedded_processes.erase(p_pid);
memdelete(ep);