Merge pull request AvaloniaUI#8165 from AvaloniaUI/fixes/position-osx

Fix more OSX regressions

Author: danwalmsley

native/Avalonia.Native/src/OSX/PopupImpl.mm

@@ -33,23 +33,6 @@ virtual NSWindowStyleMask GetStyle() override
         return NSWindowStyleMaskBorderless;
     }
 
-    virtual HRESULT Resize(double x, double y, AvnPlatformResizeReason reason) override
-    {
-        START_COM_CALL;
-
-        @autoreleasepool
-        {
-            if (Window != nullptr)
-            {
-                [Window setContentSize:NSSize{x, y}];
-
-                [Window setFrameTopLeftPoint:ToNSPoint(ConvertPointY(lastPositionSet))];
-            }
-
-            return S_OK;
-        }
-    }
-
 public:
     virtual bool ShouldTakeFocusOnShow() override
     {

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;

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,9 +91,12 @@
         CreateNSWindow(isDialog);
         InitialiseNSWindow();
 
-        if(lastPositionSet.X >= 0 && lastPositionSet.Y >= 0)
+        if(hasPosition)
         {
             SetPosition(lastPositionSet);
+        } else
+        {
+            [Window center];
         }
 
         UpdateStyle();
@@ -287,12 +290,12 @@
         }
 
         @try {
+            lastSize = NSSize {x, y};
+
             if (!_shown) {
                 BaseEvents->Resized(AvnSize{x, y}, reason);
             }
 
-            lastSize = NSSize {x, y};
-
             if(Window != nullptr) {
                 [Window setContentSize:lastSize];
             }
@@ -384,6 +387,7 @@
 
     @autoreleasepool {
         lastPositionSet = point;
+        hasPosition = true;
 
         if(Window != nullptr) {
             [Window setFrameTopLeftPoint:ToNSPoint(ConvertPointY(point))];
@@ -576,7 +580,6 @@
         [Window setContentMaxSize:lastMaxSize];
 
         [Window setOpaque:false];
-        [Window center];
 
         if (lastMenu != nullptr) {
             [GetWindowProtocol() applyMenu:lastMenu];