maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #40232 from bruvzg/macos_transient

Browse source 
[macOS] Fix transient windows.
This commit is contained in:
Rémi Verschelde 2020-07-09 14:27:15 +02:00 committed by GitHub
parent 25858f3607 bcc3c72d9c
commit c074350609
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
platform/osx/display_server_osx.mm
View file

@ -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];
}
}