From 32cdd1e35ce088c3d341cb703e9c4bcba382fe86 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Mon, 16 Aug 2021 17:33:40 +0300
Subject: [PATCH] Merge pull request #6373 from
 wieslawsoltes/SkiaOpacityMaskFixes

Fix skia OpacityMask push and pop methods
---
 src/Skia/Avalonia.Skia/DrawingContextImpl.cs | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
index 2352b8b076..ea4c35d6e7 100644
--- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
+++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -534,7 +534,11 @@ namespace Avalonia.Skia
         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 @@ namespace Avalonia.Skia
         /// <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())