diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-07-09 14:27:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-09 14:27:15 +0200 |
| commit | c074350609cd7afbf26070c1c6f1a0a4ca8f54f3 (patch) | |
| tree | 7d4283ab87109f2eb4b387b437718a8a8a29c30b /platform | |
| parent | 25858f360701e7db73852744f0053d8132be537f (diff) | |
| parent | bcc3c72d9ca7a297c2e37525dcdc3b072dd4c4af (diff) | |
Merge pull request #40232 from bruvzg/macos_transient
[macOS] Fix transient windows.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/osx/display_server_osx.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/osx/display_server_osx.mm b/platform/osx/display_server_osx.mm index b7b750a975..07ecd5d2c6 100644 --- a/platform/osx/display_server_osx.mm +++ b/platform/osx/display_server_osx.mm @@ -2465,7 +2465,7 @@ void DisplayServerOSX::window_set_transient(WindowID p_window, WindowID p_parent wd_window.transient_parent = INVALID_WINDOW_ID; wd_parent.transient_children.erase(p_window); - [wd_window.window_object setParentWindow:nil]; + [wd_parent.window_object removeChildWindow:wd_window.window_object]; } else { ERR_FAIL_COND(!windows.has(p_parent)); ERR_FAIL_COND_MSG(wd_window.transient_parent != INVALID_WINDOW_ID, "Window already has a transient parent"); @@ -2474,7 +2474,7 @@ void DisplayServerOSX::window_set_transient(WindowID p_window, WindowID p_parent wd_window.transient_parent = p_parent; wd_parent.transient_children.insert(p_window); - [wd_window.window_object setParentWindow:wd_parent.window_object]; + [wd_parent.window_object addChildWindow:wd_window.window_object ordered:NSWindowAbove]; } } |