fix: reverse clip and set fillrule to oddeven

unoplatform · Nov 14, 2024 · f20b0b8 · f20b0b8
1 parent bd3d611
commit f20b0b8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/Uno.UI.Runtime.Skia.MacOS/MacOSWindowHost.cs b/src/Uno.UI.Runtime.Skia.MacOS/MacOSWindowHost.cs
@@ -87,9 +87,10 @@ private void Draw(double nativeWidth, double nativeHeight, SKSurface surface)
 				var path = SkiaRenderHelper.RenderRootVisualAndReturnPath(width, height, rootVisual, surface);
 				if (path is { })
 				{
-					var svg = path.ToSvgPathData();
-					// remove first path since it cover the whole area
-					NativeUno.uno_window_clip_svg(_nativeWindow.Handle, svg.Substring(svg.IndexOf('Z') + 1));
+					using var negativePath = new SKPath();
+					negativePath.AddRect(new SKRect(0, 0, width, height));
+					using var diffPath = negativePath.Op(path, SKPathOp.Difference);
+					NativeUno.uno_window_clip_svg(_nativeWindow.Handle, diffPath.ToSvgPathData());
 				}
 			}
 		}

diff --git a/src/Uno.UI.Runtime.Skia.MacOS/UnoNativeMac/UnoNativeMac/UNOWindow.m b/src/Uno.UI.Runtime.Skia.MacOS/UnoNativeMac/UnoNativeMac/UNOWindow.m
@@ -746,6 +746,7 @@ void uno_window_clip_svg(UNOWindow* window, const char* svg)
             }
             mask.fillColor = NSColor.blueColor.CGColor; // anything but clearColor
             mask.path = path;
+            mask.fillRule = kCAFillRuleEvenOdd;
         }
     }
 }