From 2a9e112a2092a626055220a1ffe06a43f0520e7f Mon Sep 17 00:00:00 2001 From: ClemensFischer Date: Tue, 6 Jan 2026 08:07:25 +0100 Subject: [PATCH] Updated Matrix --- MapControl/Shared/Matrix.cs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/MapControl/Shared/Matrix.cs b/MapControl/Shared/Matrix.cs index 073efb67..030a55e6 100644 --- a/MapControl/Shared/Matrix.cs +++ b/MapControl/Shared/Matrix.cs @@ -1,17 +1,18 @@ using System; #if UWP -using PlatformMatrix = Windows.UI.Xaml.Media.Matrix; +using FrameworkMatrix = Windows.UI.Xaml.Media.Matrix; #elif WINUI -using PlatformMatrix = Microsoft.UI.Xaml.Media.Matrix; +using FrameworkMatrix = Microsoft.UI.Xaml.Media.Matrix; #elif AVALONIA using Avalonia; -using PlatformMatrix = Avalonia.Matrix; +using FrameworkMatrix = Avalonia.Matrix; #endif namespace MapControl { /// - /// Replaces Windows/Microsoft.UI.Xaml.Media.Matrix to expose manipulation methods. + /// Replaces Windows.UI.Xaml.Media.Matrix, Microsoft.UI.Xaml.Media.Matrix and Avalonia.Matrix + /// to expose Translate, Rotate and Invert methods. /// public struct Matrix(double m11, double m12, double m21, double m22, double offsetX, double offsetY) { @@ -22,7 +23,7 @@ namespace MapControl public double OffsetX { get; private set; } = offsetX; public double OffsetY { get; private set; } = offsetY; - public static implicit operator Matrix(PlatformMatrix m) + public static implicit operator Matrix(FrameworkMatrix m) { #if AVALONIA return new Matrix(m.M11, m.M12, m.M21, m.M22, m.M31, m.M32); @@ -31,9 +32,9 @@ namespace MapControl #endif } - public static implicit operator PlatformMatrix(Matrix m) + public static implicit operator FrameworkMatrix(Matrix m) { - return new PlatformMatrix(m.M11, m.M12, m.M21, m.M22, m.OffsetX, m.OffsetY); + return new FrameworkMatrix(m.M11, m.M12, m.M21, m.M22, m.OffsetX, m.OffsetY); } public readonly Point Transform(Point p)