Merge pull request AvaloniaUI#8158 from AvaloniaUI/fixes/osx-nswindow…

…-refactor-position [OSX] nswindow refactor - ensure position property is consistent before window is open.
donandren · May 19, 2022 · db20d69 · db20d69
1 parent f1053d1
commit db20d69
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm b/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
@@ -363,12 +363,17 @@
             return E_POINTER;
         }
 
-        auto frame = [Window frame];
+        if(Window != nullptr) {
+            auto frame = [Window frame];
 
-        ret->X = frame.origin.x;
-        ret->Y = frame.origin.y + frame.size.height;
+            ret->X = frame.origin.x;
+            ret->Y = frame.origin.y + frame.size.height;
 
-        *ret = ConvertPointY(*ret);
+            *ret = ConvertPointY(*ret);
+        } else
+        {
+            *ret = lastPositionSet;
+        }
 
         return S_OK;
     }