Merge pull request #6250 from AvaloniaUI/fixes/osx-red-flicker

Fixes/osx flicker
AvaloniaUI · Jul 15, 2021 · b53db52 · b53db52
1 parent d77143f
commit b53db52
Showing 1 changed file with 26 additions and 9 deletions.
diff --git a/native/Avalonia.Native/src/OSX/window.mm b/native/Avalonia.Native/src/OSX/window.mm
@@ -29,10 +29,12 @@
     IAvnMenu* _mainMenu;
 
     bool _shown;
+    bool _inResize;
 
     WindowBaseImpl(IAvnWindowBaseEvents* events, IAvnGlContext* gl)
     {
         _shown = false;
+        _inResize = false;
         _mainMenu = nullptr;
         BaseEvents = events;
         _glContext = gl;
@@ -262,6 +264,13 @@ virtual HRESULT SetMinMaxSize (AvnSize minSize, AvnSize maxSize) override
 
     virtual HRESULT Resize(double x, double y) override
     {
+        if(_inResize)
+        {
+            return S_OK;
+        }
+
+        _inResize = true;
+
         START_COM_CALL;
 
         @autoreleasepool
@@ -289,13 +298,19 @@ virtual HRESULT Resize(double x, double y) override
                 y = maxSize.height;
             }
 
-            if(!_shown)
+            @try
             {
-                BaseEvents->Resized(AvnSize{x,y});
+                if(!_shown)
+                {
+                    BaseEvents->Resized(AvnSize{x,y});
+                }
+
+                [Window setContentSize:NSSize{x, y}];
+            }
+            @finally
+            {
+                _inResize = false;
             }
-
-            [StandardContainer setFrameSize:NSSize{x,y}];
-            [Window setContentSize:NSSize{x, y}];
 
             return S_OK;
         }
@@ -1274,6 +1289,9 @@ -(AutoFitContentView* _Nonnull) initWithContent:(NSView *)content
     [_blurBehind setWantsLayer:true];
     _blurBehind.hidden = true;
 
+    [_blurBehind setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
+    [_content setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
+
     [self addSubview:_blurBehind];
     [self addSubview:_content];
 
@@ -1309,9 +1327,6 @@ -(void)setFrameSize:(NSSize)newSize
     _settingSize = true;
     [super setFrameSize:newSize];
 
-    [_blurBehind setFrameSize:newSize];
-    [_content setFrameSize:newSize];
-
     auto window = objc_cast<AvnWindow>([self window]);
 
     // TODO get actual titlebar size
@@ -1327,6 +1342,7 @@ -(void)setFrameSize:(NSSize)newSize
     [_titleBarMaterial setFrame:tbar];
     tbar.size.height = height < 1 ? 0 : 1;
     [_titleBarUnderline setFrame:tbar];
+
     _settingSize = false;
 }
 
@@ -2353,11 +2369,12 @@ virtual NSWindowStyleMask GetStyle() override
 
     virtual HRESULT Resize(double x, double y) override
     {
+        START_COM_CALL;
+
         @autoreleasepool
         {
             if (Window != nullptr)
             {
-                [StandardContainer setFrameSize:NSSize{x,y}];
                 [Window setContentSize:NSSize{x, y}];
 
                 [Window setFrameTopLeftPoint:ToNSPoint(ConvertPointY(lastPositionSet))];