From 8df4a7149443e6085cce13ba6024a2b01bab6280 Mon Sep 17 00:00:00 2001 From: Ramez Ragaa Date: Tue, 19 Nov 2024 13:31:30 +0200 Subject: [PATCH] chore: post rebase --- .../Composition/CompositionSpriteShape.skia.cs | 4 ++-- src/Uno.UI/UI/Xaml/Media/PathGeometry.skia.cs | 6 +++--- src/Uno.UI/UI/Xaml/Shapes/Shape.skia.cs | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Uno.UI.Composition/Composition/CompositionSpriteShape.skia.cs b/src/Uno.UI.Composition/Composition/CompositionSpriteShape.skia.cs index a9df0122a322..83b89b666b8c 100644 --- a/src/Uno.UI.Composition/Composition/CompositionSpriteShape.skia.cs +++ b/src/Uno.UI.Composition/Composition/CompositionSpriteShape.skia.cs @@ -25,9 +25,9 @@ public partial class CompositionSpriteShape : CompositionShape /// a CompositionMaskBrush that (presumably) masks out certain areas. We compensate for this by using this /// geometry as the mask. /// - public CompositionGeometry? FillGeometry + internal CompositionGeometry? FillGeometry { - get => _fillGeometry; + private get => _fillGeometry; set => SetProperty(ref _fillGeometry, value); } diff --git a/src/Uno.UI/UI/Xaml/Media/PathGeometry.skia.cs b/src/Uno.UI/UI/Xaml/Media/PathGeometry.skia.cs index 3ae5b844d3cb..065f51a2a963 100644 --- a/src/Uno.UI/UI/Xaml/Media/PathGeometry.skia.cs +++ b/src/Uno.UI/UI/Xaml/Media/PathGeometry.skia.cs @@ -9,11 +9,11 @@ partial class PathGeometry internal override SKPath GetFilledSKPath() => GetSKPath(true); - internal SKPath GetSKPath(bool skipUnfilled) + private SKPath GetSKPath(bool skipUnfilled) { var path = new SKPath(); - foreach (var figure in Figures) + foreach (PathFigure figure in Figures) { if (skipUnfilled && !figure.IsFilled) { @@ -22,7 +22,7 @@ internal SKPath GetSKPath(bool skipUnfilled) path.MoveTo((float)figure.StartPoint.X, (float)figure.StartPoint.Y); - foreach (var segment in figure.Segments) + foreach (PathSegment segment in figure.Segments) { if (segment is LineSegment lineSegment) { diff --git a/src/Uno.UI/UI/Xaml/Shapes/Shape.skia.cs b/src/Uno.UI/UI/Xaml/Shapes/Shape.skia.cs index f516d6adb362..3ebae55b3d95 100644 --- a/src/Uno.UI/UI/Xaml/Shapes/Shape.skia.cs +++ b/src/Uno.UI/UI/Xaml/Shapes/Shape.skia.cs @@ -11,7 +11,7 @@ partial class Shape private readonly CompositionSpriteShape _shape; private readonly CompositionPathGeometry _geometry; - protected CompositionSpriteShape SpriteShape => _shape; + private protected CompositionSpriteShape SpriteShape => _shape; public Shape() { @@ -32,7 +32,7 @@ private Rect GetPathBoundingBox(SkiaGeometrySource2D path) private protected override ContainerVisual CreateElementVisual() => Compositor.GetSharedCompositor().CreateShapeVisual(); - private protected void Render(Microsoft.UI.Composition.SkiaGeometrySource2D? path, double? scaleX = null, double? scaleY = null, double? renderOriginX = null, double? renderOriginY = null) + private protected virtual void Render(Microsoft.UI.Composition.SkiaGeometrySource2D? path, double? scaleX = null, double? scaleY = null, double? renderOriginX = null, double? renderOriginY = null) { if (path is null) {