From 3e8ce3deb1478a4a110b2e5ee4dad716368a08a4 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 17 May 2022 18:23:33 +0100
Subject: [PATCH] [OSX] GetFrameSize - explicitly detect when native side didnt
 touch result object to signal null.

---
 native/Avalonia.Native/src/OSX/WindowBaseImpl.mm | 6 +-----
 src/Avalonia.Native/WindowImplBase.cs            | 8 ++++++--
 src/Avalonia.Native/avn.idl                      | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm b/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
index 0f934ce5a2..b8dacbc132 100644
--- a/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
+++ b/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
@@ -205,11 +205,7 @@ HRESULT WindowBaseImpl::GetFrameSize(AvnSize *ret) {
         if (ret == nullptr)
             return E_POINTER;
 
-        if(Window == nullptr){
-            ret->Width = 0;
-            ret->Height = 0;
-        }
-        else {
+        if(Window != nullptr){
             auto frame = [Window frame];
             ret->Width = frame.size.width;
             ret->Height = frame.size.height;
diff --git a/src/Avalonia.Native/WindowImplBase.cs b/src/Avalonia.Native/WindowImplBase.cs
index 36352f6397..94a3a5ed9b 100644
--- a/src/Avalonia.Native/WindowImplBase.cs
+++ b/src/Avalonia.Native/WindowImplBase.cs
@@ -116,8 +116,12 @@ namespace Avalonia.Native
             {
                 if (_native != null)
                 {
-                    var s = _native.FrameSize;
-                    return s.Width == 0 && s.Height == 0 ? null : new Size(s.Width, s.Height);
+                    unsafe
+                    {
+                        var s = new AvnSize { Width = -1, Height = -1 };
+                        _native.GetFrameSize(&s);
+                        return s.Width < 0  && s.Height < 0 ? null : new Size(s.Width, s.Height);
+                    }
                 }
 
                 return default;
diff --git a/src/Avalonia.Native/avn.idl b/src/Avalonia.Native/avn.idl
index d6ef0f8918..a1c73e1f03 100644
--- a/src/Avalonia.Native/avn.idl
+++ b/src/Avalonia.Native/avn.idl
@@ -504,7 +504,7 @@ interface IAvnWindowBase : IUnknown
      HRESULT Close();
      HRESULT Activate();
      HRESULT GetClientSize(AvnSize*ret);
-     HRESULT GetFrameSize(AvnSize*ret);
+     HRESULT GetFrameSize(AvnSize*result);
      HRESULT GetScaling(double*ret);
      HRESULT SetMinMaxSize(AvnSize minSize, AvnSize maxSize);
      HRESULT Resize(double width, double height, AvnPlatformResizeReason reason);