never return -1,-1 for position.

donandren · May 19, 2022 · 24164ca · 24164ca
1 parent db20d69
commit 24164ca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/native/Avalonia.Native/src/OSX/WindowBaseImpl.h b/native/Avalonia.Native/src/OSX/WindowBaseImpl.h
@@ -35,6 +35,7 @@ BEGIN_INTERFACE_MAP()
     ComPtr<IAvnGlContext> _glContext;
     NSObject <IRenderTarget> *renderTarget;
     AvnPoint lastPositionSet;
+    bool hasPosition;
     NSSize lastSize;
     NSSize lastMinSize;
     NSSize lastMaxSize;

diff --git a/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm b/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
@@ -29,8 +29,8 @@
     View = [[AvnView alloc] initWithParent:this];
     StandardContainer = [[AutoFitContentView new] initWithContent:View];
 
-    lastPositionSet.X = -1;
-    lastPositionSet.Y = -1;
+    lastPositionSet = { 0, 0 };
+    hasPosition = false;
     lastSize = NSSize { 100, 100 };
     lastMaxSize = NSSize { CGFLOAT_MAX, CGFLOAT_MAX};
     lastMinSize = NSSize { 0, 0 };
@@ -91,7 +91,7 @@
         CreateNSWindow(isDialog);
         InitialiseNSWindow();
 
-        if(lastPositionSet.X >= 0 && lastPositionSet.Y >= 0)
+        if(hasPosition)
         {
             SetPosition(lastPositionSet);
         }
@@ -384,6 +384,7 @@
 
     @autoreleasepool {
         lastPositionSet = point;
+        hasPosition = true;
 
         if(Window != nullptr) {
             [Window setFrameTopLeftPoint:ToNSPoint(ConvertPointY(point))];