Merge pull request #6373 from wieslawsoltes/SkiaOpacityMaskFixes

Fix skia OpacityMask push and pop methods
AvaloniaUI · Aug 16, 2021 · cf9bb15 · cf9bb15
2 parents 1855a8c + ec62912
commit cf9bb15
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -534,7 +534,11 @@ public void PopBitmapBlendMode()
         public void PushOpacityMask(IBrush mask, Rect bounds)
         {
             // TODO: This should be disposed
-            var paint = new SKPaint();
+            var paint = new SKPaint()
+            {
+                IsAntialias = true,
+                Style = SKPaintStyle.StrokeAndFill
+            };
 
             Canvas.SaveLayer(paint);
             _maskStack.Push(CreatePaint(paint, mask, bounds, true));
@@ -543,7 +547,14 @@ public void PushOpacityMask(IBrush mask, Rect bounds)
         /// <inheritdoc />
         public void PopOpacityMask()
         {
-            using (var paint = new SKPaint { BlendMode = SKBlendMode.DstIn })
+            using (var paint = new SKPaint
+            {
+                IsAntialias = true,
+                Style = SKPaintStyle.StrokeAndFill,
+                BlendMode = SKBlendMode.DstIn,
+                Color = new SKColor(0, 0, 0, 255),
+                ColorFilter = SKColorFilter.CreateLumaColor()
+            })
             {
                 Canvas.SaveLayer(paint);
                 using (var paintWrapper = _maskStack.Pop())