From 8f4e53b0fc4b68f8fbcdcd429b775dd9aa29b590 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Thu, 29 Jul 2021 07:06:18 -0400
Subject: [PATCH] Merge pull request #6266 from
 AvaloniaUI/fixes/osx-resizing-again

OSX: Fix showing window with no specified size.
# Conflicts:
#	native/Avalonia.Native/src/OSX/window.mm
---
 native/Avalonia.Native/src/OSX/window.mm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/native/Avalonia.Native/src/OSX/window.mm b/native/Avalonia.Native/src/OSX/window.mm
index 87909a15f5..150fe218dc 100644
--- a/native/Avalonia.Native/src/OSX/window.mm
+++ b/native/Avalonia.Native/src/OSX/window.mm
@@ -52,6 +52,7 @@ public:
         [Window setBackingType:NSBackingStoreBuffered];
         
         [Window setOpaque:false];
+        [Window setContentView: StandardContainer];
     }
     
     virtual HRESULT ObtainNSWindowHandle(void** ret) override
@@ -124,7 +125,7 @@ public:
             SetPosition(lastPositionSet);
             UpdateStyle();
             
-            [Window setContentView: StandardContainer];
+            [Window setTitle:_lastTitle];
             
             if(ShouldTakeFocusOnShow() && activate)
             {