summaryrefslogtreecommitdiff
path: root/platform/macos
diff options
context:
space:
mode:
authorbruvzg <7645683+bruvzg@users.noreply.github.com>2021-04-15 14:22:58 -0400
committerbruvzg <7645683+bruvzg@users.noreply.github.com>2023-01-26 12:38:53 +0200
commit700d85bd19268c17961f5853bf4f46a22ce7e19b (patch)
tree33f2f8d2ac7c58d9ea6c280dbae0e07be34de1ed /platform/macos
parentcc7aa72f01fdea5f93b0a618fcd12db55617beb0 (diff)
Extend special popup window handling to any non-popup child of a popup.
Diffstat (limited to 'platform/macos')
-rw-r--r--platform/macos/display_server_macos.mm17
1 files changed, 16 insertions, 1 deletions
diff --git a/platform/macos/display_server_macos.mm b/platform/macos/display_server_macos.mm
index 2832495693..b1880c2fb6 100644
--- a/platform/macos/display_server_macos.mm
+++ b/platform/macos/display_server_macos.mm
@@ -3681,8 +3681,23 @@ Rect2i DisplayServerMacOS::window_get_popup_safe_rect(WindowID p_window) const {
void DisplayServerMacOS::popup_open(WindowID p_window) {
_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];
- if (wd.is_popup) {
+ if (wd.is_popup || has_popup_ancestor) {
bool was_empty = popup_list.is_empty();
// Find current popup parent, or root popup if new window is not transient.
List<WindowID>::Element *C = nullptr;