Browse Source

Merge pull request #6867 from AvaloniaUI/fixes/osx-fullscreen-modals

[OSX] allow child windows to be shown on top of fullscreen windows.
release/0.10.11-rc.1
Dan Walmsley 4 years ago
parent
commit
82c3ff20f2
  1. 7
      native/Avalonia.Native/src/OSX/window.mm

7
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();

Loading…
Cancel
Save