From 3600639d39482ef60efbb573f4586d8019da745a Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sun, 8 May 2022 19:17:08 +0100
Subject: [PATCH] re-create NSWindow if we call show and need to swap out for a
 dialog.

---
 native/Avalonia.Native/src/OSX/AvnWindow.mm   |  4 ++++
 .../Avalonia.Native/src/OSX/WindowBaseImpl.h  |  1 +
 .../Avalonia.Native/src/OSX/WindowBaseImpl.mm | 21 ++++++++++++++-----
 .../Avalonia.Native/src/OSX/WindowProtocol.h  |  1 +
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/native/Avalonia.Native/src/OSX/AvnWindow.mm b/native/Avalonia.Native/src/OSX/AvnWindow.mm
index 33f7f75314..6ff19ead68 100644
--- a/native/Avalonia.Native/src/OSX/AvnWindow.mm
+++ b/native/Avalonia.Native/src/OSX/AvnWindow.mm
@@ -433,5 +433,9 @@
     }
 }
 
+- (void)disconnectParent {
+    _parent = nullptr;
+}
+
 @end
 
diff --git a/native/Avalonia.Native/src/OSX/WindowBaseImpl.h b/native/Avalonia.Native/src/OSX/WindowBaseImpl.h
index 8c82bba98c..eff13bcb23 100644
--- a/native/Avalonia.Native/src/OSX/WindowBaseImpl.h
+++ b/native/Avalonia.Native/src/OSX/WindowBaseImpl.h
@@ -123,6 +123,7 @@ protected:
 
 private:
     void CreateNSWindow (bool isDialog);
+    void CleanNSWindow ();
     void InitialiseNSWindow ();
 };
 
diff --git a/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm b/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
index 227f348333..a7c38bf652 100644
--- a/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
+++ b/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
@@ -525,14 +525,25 @@ void WindowBaseImpl::UpdateStyle() {
     [Window setStyleMask:GetStyle()];
 }
 
+void WindowBaseImpl::CleanNSWindow() {
+    if(Window != nullptr) {
+        [GetWindowProtocol() disconnectParent];
+        [Window close];
+        Window = nullptr;
+    }
+}
+
 void WindowBaseImpl::CreateNSWindow(bool isDialog) {
-    if(Window == nullptr) {
-        if(isDialog)
-        {
+    if (isDialog) {
+        if (![Window isKindOfClass:[AvnPanel class]]) {
+            CleanNSWindow();
+
             Window = [[AvnPanel alloc] initWithParent:this contentRect:NSRect{0, 0, lastSize} styleMask:GetStyle()];
         }
-        else
-        {
+    } else {
+        if (![Window isKindOfClass:[AvnWindow class]]) {
+            CleanNSWindow();
+
             Window = [[AvnWindow alloc] initWithParent:this contentRect:NSRect{0, 0, lastSize} styleMask:GetStyle()];
         }
     }
diff --git a/native/Avalonia.Native/src/OSX/WindowProtocol.h b/native/Avalonia.Native/src/OSX/WindowProtocol.h
index 1c97d89f39..92194706de 100644
--- a/native/Avalonia.Native/src/OSX/WindowProtocol.h
+++ b/native/Avalonia.Native/src/OSX/WindowProtocol.h
@@ -20,5 +20,6 @@
 
 -(double) getExtendedTitleBarHeight;
 -(void) setIsExtended:(bool)value;
+-(void) disconnectParent;
 -(bool) isDialog;
 @end
\ No newline at end of file