godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Extend special popup window handling to any non-popup child of a popup.

Browse Source
This commit is contained in:
bruvzg
2021-04-15 14:22:58 -04:00
parent cc7aa72f01
commit 700d85bd19
3 changed files with 49 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3608,8 +3608,23 @@ Rect2i DisplayServerX11::window_get_popup_safe_rect(WindowID p_window) const {
void DisplayServerX11::popup_open(WindowID p_window) { void DisplayServerX11::popup_open(WindowID p_window) {
_THREAD_SAFE_METHOD_ _THREAD_SAFE_METHOD_
bool has_popup_ancestor = false;
WindowID transient_root = p_window;
while (true) {
WindowID parent = windows[transient_root].transient_parent;
if (parent == INVALID_WINDOW_ID) {
break;
} else {
transient_root = parent;
if (windows[parent].is_popup) {
has_popup_ancestor = true;
break;
}
}
}
WindowData &wd = windows[p_window]; WindowData &wd = windows[p_window];
if (wd.is_popup) { if (wd.is_popup || has_popup_ancestor) {
// Find current popup parent, or root popup if new window is not transient. // Find current popup parent, or root popup if new window is not transient.
List<WindowID>::Element *C = nullptr; List<WindowID>::Element *C = nullptr;
List<WindowID>::Element *E = popup_list.back(); List<WindowID>::Element *E = popup_list.back();

17
platform/macos/display_server_macos.mm
View File

@@ -3681,8 +3681,23 @@ Rect2i DisplayServerMacOS::window_get_popup_safe_rect(WindowID p_window) const {
void DisplayServerMacOS::popup_open(WindowID p_window) { void DisplayServerMacOS::popup_open(WindowID p_window) {
_THREAD_SAFE_METHOD_ _THREAD_SAFE_METHOD_
bool has_popup_ancestor = false;
WindowID transient_root = p_window;
while (true) {
WindowID parent = windows[transient_root].transient_parent;
if (parent == INVALID_WINDOW_ID) {
break;
} else {
transient_root = parent;
if (windows[parent].is_popup) {
has_popup_ancestor = true;
break;
}
}
}
WindowData &wd = windows[p_window]; WindowData &wd = windows[p_window];
if (wd.is_popup) { if (wd.is_popup || has_popup_ancestor) {
bool was_empty = popup_list.is_empty(); bool was_empty = popup_list.is_empty();
// Find current popup parent, or root popup if new window is not transient. // Find current popup parent, or root popup if new window is not transient.
List<WindowID>::Element *C = nullptr; List<WindowID>::Element *C = nullptr;

19
platform/windows/display_server_windows.cpp
View File

@@ -2396,8 +2396,23 @@ Rect2i DisplayServerWindows::window_get_popup_safe_rect(WindowID p_window) const
void DisplayServerWindows::popup_open(WindowID p_window) { void DisplayServerWindows::popup_open(WindowID p_window) {
_THREAD_SAFE_METHOD_ _THREAD_SAFE_METHOD_
const WindowData &wd = windows[p_window]; bool has_popup_ancestor = false;
if (wd.is_popup) { WindowID transient_root = p_window;
while (true) {
WindowID parent = windows[transient_root].transient_parent;
if (parent == INVALID_WINDOW_ID) {
break;
} else {
transient_root = parent;
if (windows[parent].is_popup) {
has_popup_ancestor = true;
break;
}
}
}
WindowData &wd = windows[p_window];
if (wd.is_popup || has_popup_ancestor) {
// Find current popup parent, or root popup if new window is not transient. // Find current popup parent, or root popup if new window is not transient.
List<WindowID>::Element *C = nullptr; List<WindowID>::Element *C = nullptr;
List<WindowID>::Element *E = popup_list.back(); List<WindowID>::Element *E = popup_list.back();