From bb571a4a0341309411341b9efb0a160fe0a51009 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 10 Dec 2019 09:07:02 -0300
Subject: [PATCH] [OSX] access scaling and window size in thread safe manner.

---
 native/Avalonia.Native/src/OSX/gl.mm     | 13 ++++----
 native/Avalonia.Native/src/OSX/window.h  |  2 ++
 native/Avalonia.Native/src/OSX/window.mm | 42 +++++++++++++++++-------
 3 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/native/Avalonia.Native/src/OSX/gl.mm b/native/Avalonia.Native/src/OSX/gl.mm
index 083adc927d..ba5183dfa1 100644
--- a/native/Avalonia.Native/src/OSX/gl.mm
+++ b/native/Avalonia.Native/src/OSX/gl.mm
@@ -1,6 +1,7 @@
 #include "common.h"
 #include <OpenGL/gl.h>
 #include <dlfcn.h>
+#include "window.h"
 
 template <typename T, size_t N> char (&ArrayCounter(T (&a)[N]))[N];
 #define ARRAY_COUNT(a) (sizeof(ArrayCounter(a)))
@@ -181,12 +182,12 @@ extern IAvnGlFeature* GetGlFeature()
 
 class AvnGlRenderingSession : public ComSingleObject<IAvnGlSurfaceRenderingSession, &IID_IAvnGlSurfaceRenderingSession>
 {
-    NSView* _view;
-    NSWindow* _window;
+    AvnView* _view;
+    AvnWindow* _window;
     NSOpenGLContext* _context;
 public:
     FORWARD_IUNKNOWN()
-    AvnGlRenderingSession(NSWindow*window, NSView* view, NSOpenGLContext* context)
+    AvnGlRenderingSession(AvnWindow*window, AvnView* view, NSOpenGLContext* context)
     {
         _context = context;
         _window = window;
@@ -195,14 +196,12 @@ public:
     
     virtual HRESULT GetPixelSize(AvnPixelSize* ret)  override
     {
-        auto fsize = [_view convertSizeToBacking: [_view frame].size];
-        ret->Width = (int)fsize.width;
-        ret->Height = (int)fsize.height;
+        *ret = [_view getPixelSize];
         return S_OK;
     }
     virtual HRESULT GetScaling(double* ret)  override
     {
-        *ret = [_window backingScaleFactor];
+        *ret = [_window getScaling];
         return S_OK;
     }
     
diff --git a/native/Avalonia.Native/src/OSX/window.h b/native/Avalonia.Native/src/OSX/window.h
index 932bc56a2e..3e626675d2 100644
--- a/native/Avalonia.Native/src/OSX/window.h
+++ b/native/Avalonia.Native/src/OSX/window.h
@@ -12,6 +12,7 @@ class WindowBaseImpl;
 -(AvnPoint) translateLocalPoint:(AvnPoint)pt;
 -(void) setSwRenderedFrame: (AvnFramebuffer* _Nonnull) fb dispose: (IUnknown* _Nonnull) dispose;
 -(void) onClosed;
+-(AvnPixelSize) getPixelSize;
 @end
 
 @interface AvnWindow : NSWindow <NSWindowDelegate>
@@ -22,6 +23,7 @@ class WindowBaseImpl;
 -(void) restoreParentWindow;
 -(bool) shouldTryToHandleEvents;
 -(void) applyMenu:(NSMenu *)menu;
+-(double) getScaling;
 @end
 
 struct INSWindowHolder
diff --git a/native/Avalonia.Native/src/OSX/window.mm b/native/Avalonia.Native/src/OSX/window.mm
index cd8c6245ba..a73ab0a9a9 100644
--- a/native/Avalonia.Native/src/OSX/window.mm
+++ b/native/Avalonia.Native/src/OSX/window.mm
@@ -719,6 +719,7 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     bool _isLeftPressed, _isMiddlePressed, _isRightPressed, _isXButton1Pressed, _isXButton2Pressed, _isMouseOver;
     NSEvent* _lastMouseDownEvent;
     bool _lastKeyHandled;
+    AvnPixelSize _lastPixelSize;
 }
 
 - (void)dealloc
@@ -730,6 +731,11 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     _parent = NULL;
 }
 
+-(AvnPixelSize) getPixelSize
+{
+    return _lastPixelSize;
+}
+
 - (NSEvent*) lastMouseDownEvent
 {
     return _lastMouseDownEvent;
@@ -742,6 +748,8 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     [self setWantsLayer:YES];
     _parent = parent;
     _area = nullptr;
+    _lastPixelSize.Height = 0;
+    _lastPixelSize.Width = 0;
     return self;
 }
 
@@ -783,6 +791,10 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     [self addTrackingArea:_area];
     
     _parent->UpdateCursor();
+    
+    auto fsize = [self convertSizeToBacking: [self frame].size];
+    _lastPixelSize.Width = (int)fsize.width;
+    _lastPixelSize.Height = (int)fsize.height;
 
     _parent->BaseEvents->Resized(AvnSize{newSize.width, newSize.height});
 }
@@ -885,7 +897,12 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
 
 - (void) viewDidChangeBackingProperties
 {
+    auto fsize = [self convertSizeToBacking: [self frame].size];
+    _lastPixelSize.Width = (int)fsize.width;
+    _lastPixelSize.Height = (int)fsize.height;
+    
     _parent->BaseEvents->ScalingChanged([_parent->Window backingScaleFactor]);
+    
     [super viewDidChangeBackingProperties];
 }
 
@@ -1167,6 +1184,12 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     bool _closed;
     NSMenu* _menu;
     bool _isAppMenuApplied;
+    double _lastScaling;
+}
+
+-(double) getScaling
+{
+    return _lastScaling;
 }
 
 +(void)closeAll
@@ -1238,6 +1261,8 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     [self setReleasedWhenClosed:false];
     _parent = parent;
     [self setDelegate:self];
+    
+    _lastScaling = [self backingScaleFactor];
     return self;
 }
 
@@ -1253,6 +1278,11 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     return true;
 }
 
+- (void)windowDidChangeBackingProperties:(NSNotification *)notification
+{
+    _lastScaling = [self backingScaleFactor];
+}
+
 - (void)windowWillClose:(NSNotification *)notification
 {
     _closed = true;
@@ -1412,18 +1442,6 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     _parent->GetPosition(&position);
     _parent->BaseEvents->PositionChanged(position);
 }
-
-// TODO this breaks resizing.
-/*- (void)windowDidResize:(NSNotification *)notification
-{
-    
-    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
-    
-    if(parent != nullptr)
-    {
-        parent->WindowStateChanged();
-    }
-}*/
 @end
 
 class PopupImpl : public virtual WindowBaseImpl, public IAvnPopup