From 84ea185f0faf0d39e6d8db8be784913d9fa4dfda Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 27 May 2022 16:10:16 +0100
Subject: [PATCH 1/2] [OSX] dialogs stay ontop of main window when another app
 is displayed.

---
 native/Avalonia.Native/src/OSX/AvnView.mm        | 4 ++--
 native/Avalonia.Native/src/OSX/AvnWindow.mm      | 2 ++
 native/Avalonia.Native/src/OSX/WindowBaseImpl.mm | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/native/Avalonia.Native/src/OSX/AvnView.mm b/native/Avalonia.Native/src/OSX/AvnView.mm
index 02526afbcb..5436ad22f3 100644
--- a/native/Avalonia.Native/src/OSX/AvnView.mm
+++ b/native/Avalonia.Native/src/OSX/AvnView.mm
@@ -222,7 +222,7 @@
 
 - (void)mouseEvent:(NSEvent *)event withType:(AvnRawMouseEventType) type
 {
-    bool triggerInputWhenDisabled = type != Move;
+    bool triggerInputWhenDisabled = type != Move && type != LeaveWindow;
 
     if([self ignoreUserInput: triggerInputWhenDisabled])
     {
@@ -709,4 +709,4 @@
     return [[self accessibilityChild] accessibilityFocusedUIElement];
 }
 
-@end
\ No newline at end of file
+@end
diff --git a/native/Avalonia.Native/src/OSX/AvnWindow.mm b/native/Avalonia.Native/src/OSX/AvnWindow.mm
index f51c693777..590dc5e7ac 100644
--- a/native/Avalonia.Native/src/OSX/AvnWindow.mm
+++ b/native/Avalonia.Native/src/OSX/AvnWindow.mm
@@ -378,6 +378,8 @@
         _parent->BaseEvents->Deactivated();
 
     [self showAppMenuOnly];
+    
+    [self invalidateShadow];
 
     [super resignKeyWindow];
 }
diff --git a/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm b/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
index 6dc59ae4d8..121679b942 100644
--- a/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
+++ b/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
@@ -558,6 +558,8 @@ void WindowBaseImpl::CreateNSWindow(bool isDialog) {
             CleanNSWindow();
 
             Window = [[AvnPanel alloc] initWithParent:this contentRect:NSRect{0, 0, lastSize} styleMask:GetStyle()];
+            
+            [Window setHidesOnDeactivate:false];
         }
     } else {
         if (![Window isKindOfClass:[AvnWindow class]]) {

From 0a4b3386d5e06f49d123ac49cdc4105a316c4a19 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sun, 29 May 2022 22:02:18 +0100
Subject: [PATCH 2/2] [OSX] fix SetParent

---
 native/Avalonia.Native/src/OSX/WindowImpl.h  |  1 +
 native/Avalonia.Native/src/OSX/WindowImpl.mm | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/native/Avalonia.Native/src/OSX/WindowImpl.h b/native/Avalonia.Native/src/OSX/WindowImpl.h
index db19497b29..35627685a2 100644
--- a/native/Avalonia.Native/src/OSX/WindowImpl.h
+++ b/native/Avalonia.Native/src/OSX/WindowImpl.h
@@ -22,6 +22,7 @@ private:
     bool _transitioningWindowState;
     bool _isClientAreaExtended;
     bool _isDialog;
+    WindowImpl* _lastParent;
     AvnExtendClientAreaChromeHints _extendClientHints;
 
     FORWARD_IUNKNOWN()
diff --git a/native/Avalonia.Native/src/OSX/WindowImpl.mm b/native/Avalonia.Native/src/OSX/WindowImpl.mm
index d96fe717ab..ad804eb280 100644
--- a/native/Avalonia.Native/src/OSX/WindowImpl.mm
+++ b/native/Avalonia.Native/src/OSX/WindowImpl.mm
@@ -20,6 +20,7 @@ WindowImpl::WindowImpl(IAvnWindowEvents *events, IAvnGlContext *gl) : WindowBase
     _lastWindowState = Normal;
     _actualWindowState = Normal;
     _lastTitle = @"";
+    _lastParent = nullptr;
     WindowEvents = events;
 }
 
@@ -61,6 +62,11 @@ void WindowImpl::OnInitialiseNSWindow(){
         [GetWindowProtocol() setIsExtended:true];
         SetExtendClientArea(true);
     }
+    
+    if(_lastParent != nullptr)
+    {
+        SetParent(_lastParent);
+    }
 }
 
 HRESULT WindowImpl::Show(bool activate, bool isDialog) {
@@ -97,6 +103,10 @@ HRESULT WindowImpl::SetParent(IAvnWindow *parent) {
         if (cparent == nullptr)
             return E_INVALIDARG;
 
+        
+        _lastParent = cparent;
+        
+        if(Window != nullptr){
         // If one tries to show a child window with a minimized parent window, then the parent window will be
         // restored but macOS isn't kind enough to *tell* us that, so the window will be left in a non-interactive
         // state. Detect this and explicitly restore the parent window ourselves to avoid this situation.
@@ -107,6 +117,7 @@ HRESULT WindowImpl::SetParent(IAvnWindow *parent) {
         [cparent->Window addChildWindow:Window ordered:NSWindowAbove];
 
         UpdateStyle();
+        }
 
         return S_OK;
     }
@@ -535,7 +546,7 @@ NSWindowStyleMask WindowImpl::GetStyle() {
             break;
 
         case SystemDecorationsFull:
-            s = s | NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskBorderless;
+            s = s | NSWindowStyleMaskTitled | NSWindowStyleMaskClosable;
 
             if (_canResize) {
                 s = s | NSWindowStyleMaskResizable;