Merge pull request #5943 from AvaloniaUI/fixes/missing-osx-shadow-border

trick to make OSX invalidate the shadow.
AvaloniaUI · May 19, 2021 · 2364f66 · 2364f66
1 parent 55758e3
commit 2364f66
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/native/Avalonia.Native/src/OSX/window.h b/native/Avalonia.Native/src/OSX/window.h
@@ -34,6 +34,7 @@ class WindowBaseImpl;
 -(double) getScaling;
 -(double) getExtendedTitleBarHeight;
 -(void) setIsExtended:(bool)value;
+-(void) updateShadow;
 @end
 
 struct INSWindowHolder

diff --git a/native/Avalonia.Native/src/OSX/window.mm b/native/Avalonia.Native/src/OSX/window.mm
@@ -124,7 +124,11 @@ virtual HRESULT Show(bool activate) override
             [Window setTitle:_lastTitle];
 
             _shown = true;
-
+
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [Window updateShadow];
+            });
+
             return S_OK;
         }
     }
@@ -1838,6 +1842,19 @@ @implementation AvnWindow
     double _lastScaling;
 }
 
+- (void)updateShadow
+{
+    // Common problem in Cocoa where [invalidateShadow] does work,
+    // This hack forces Cocoa to invalidate the shadow.
+
+    NSRect frame = [self frame];
+    NSRect updatedFrame = NSMakeRect(frame.origin.x, frame.origin.y, frame.size.width + 1.0, frame.size.height + 1.0);
+    [self setFrame:updatedFrame display:YES];
+    [self setFrame:frame display:YES];
+
+    [self invalidateShadow];
+}
+
 -(void) setIsExtended:(bool)value;
 {
     _isExtended = value;