From ed805c61167a225ea81f95261805ccf5ad69ebc9 Mon Sep 17 00:00:00 2001 From: Martin Zikmund Date: Fri, 3 Jan 2025 14:17:00 +0100 Subject: [PATCH] chore: Start adjusting DisplayInformation --- .../Composition/CompositionGeometricClip.skia.cs | 7 +++---- .../Composition/CompositionPathGeometry.skia.cs | 2 ++ .../Composition/CompositionVisualSurface.skia.cs | 1 - src/Uno.UI/UI/Xaml/Media/CompositionTarget.cs | 2 -- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/Uno.UI.Composition/Composition/CompositionGeometricClip.skia.cs b/src/Uno.UI.Composition/Composition/CompositionGeometricClip.skia.cs index c0d948bd9c0b..732f0c444c64 100644 --- a/src/Uno.UI.Composition/Composition/CompositionGeometricClip.skia.cs +++ b/src/Uno.UI.Composition/Composition/CompositionGeometricClip.skia.cs @@ -12,9 +12,8 @@ partial class CompositionGeometricClip { switch (Geometry) { - case CompositionPathGeometry { Path.GeometrySource: SkiaGeometrySource2D geometrySource }: - return geometrySource.TightBounds.ToRect(); - + case CompositionPathGeometry { Geometry: SkiaGeometrySource2D genericGeometrySource }: + return genericGeometrySource.TightBounds.ToRect(); case CompositionPathGeometry cpg: throw new InvalidOperationException($"Clipping with source {cpg.Path?.GeometrySource} is not supported"); @@ -30,7 +29,7 @@ internal override void Apply(SKCanvas canvas, Visual visual) { switch (Geometry) { - case CompositionPathGeometry { Path.GeometrySource: SkiaGeometrySource2D geometrySource }: + case CompositionPathGeometry { Geometry: SkiaGeometrySource2D geometrySource }: var path = TransformMatrix.IsIdentity ? geometrySource : geometrySource.Transform(TransformMatrix.ToSKMatrix()); diff --git a/src/Uno.UI.Composition/Composition/CompositionPathGeometry.skia.cs b/src/Uno.UI.Composition/Composition/CompositionPathGeometry.skia.cs index c07fda3a5e7c..9d68e2ae00e1 100644 --- a/src/Uno.UI.Composition/Composition/CompositionPathGeometry.skia.cs +++ b/src/Uno.UI.Composition/Composition/CompositionPathGeometry.skia.cs @@ -18,6 +18,8 @@ public partial class CompositionPathGeometry : CompositionGeometry, ID2D1Geometr private SkiaGeometrySource2D? _geometrySource2D; private List _commands = new(); + internal IGeometrySource2D? Geometry => _geometrySource2D ?? Path?.GeometrySource; + internal override IGeometrySource2D? BuildGeometry() => _geometrySource2D; private void InternalBuildGeometry() diff --git a/src/Uno.UI.Composition/Composition/CompositionVisualSurface.skia.cs b/src/Uno.UI.Composition/Composition/CompositionVisualSurface.skia.cs index c15d13ec10b1..20f07c2f3c15 100644 --- a/src/Uno.UI.Composition/Composition/CompositionVisualSurface.skia.cs +++ b/src/Uno.UI.Composition/Composition/CompositionVisualSurface.skia.cs @@ -16,7 +16,6 @@ namespace Microsoft.UI.Composition public partial class CompositionVisualSurface : CompositionObject, ICompositionSurface, ISkiaSurface { private SKSurface? _surface; - private DisplayInformation? _displayInformation; private float _scale = 1.0f; SKSurface? ISkiaSurface.Surface { get => _surface; } diff --git a/src/Uno.UI/UI/Xaml/Media/CompositionTarget.cs b/src/Uno.UI/UI/Xaml/Media/CompositionTarget.cs index e972732bcc40..95df98827147 100644 --- a/src/Uno.UI/UI/Xaml/Media/CompositionTarget.cs +++ b/src/Uno.UI/UI/Xaml/Media/CompositionTarget.cs @@ -36,6 +36,4 @@ void ICompositionTarget.TryRedirectForManipulation(PointerPoint pointerPoint, In ContentRoot.InputManager.Pointers.RedirectPointer(pointerPoint, tracker); #endif } - - global::Windows.Graphics.Display.DisplayInformation ICompositionTarget.DisplayInformation => XamlRoot.GetDisplayInformation(ContentRoot?.XamlRoot); }