Browse Source
Merge pull request #6867 from AvaloniaUI/fixes/osx-fullscreen-modals
[OSX] allow child windows to be shown on top of fullscreen windows.
pull/7003/head
Dan Walmsley
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
6 additions and
1 deletions
-
native/Avalonia.Native/src/OSX/window.mm
|
|
|
@ -206,7 +206,11 @@ public: |
|
|
|
auto window = Window; |
|
|
|
Window = nullptr; |
|
|
|
|
|
|
|
[window close]; |
|
|
|
try{ |
|
|
|
// Seems to throw sometimes on application exit. |
|
|
|
[window close]; |
|
|
|
} |
|
|
|
catch(NSException*){} |
|
|
|
} |
|
|
|
|
|
|
|
return S_OK; |
|
|
|
@ -724,6 +728,7 @@ private: |
|
|
|
if (cparent->WindowState() == Minimized) |
|
|
|
cparent->SetWindowState(Normal); |
|
|
|
|
|
|
|
[Window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenAuxiliary]; |
|
|
|
[cparent->Window addChildWindow:Window ordered:NSWindowAbove]; |
|
|
|
|
|
|
|
UpdateStyle(); |
|
|
|
|