From bcdb22a0486e1cc930371ed62d8eb36943082d68 Mon Sep 17 00:00:00 2001 From: ClemensFischer Date: Sat, 4 Jan 2025 14:25:06 +0100 Subject: [PATCH] Set EdgeMode/BorderMode only in MapTileLayerBase --- MapControl/Shared/MapTileLayerBase.cs | 9 ++++++++- MapControl/WPF/MapBase.WPF.cs | 5 ----- MapControl/WinUI/MapBase.WinUI.cs | 6 ------ 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/MapControl/Shared/MapTileLayerBase.cs b/MapControl/Shared/MapTileLayerBase.cs index 79d48adf..7b144a37 100644 --- a/MapControl/Shared/MapTileLayerBase.cs +++ b/MapControl/Shared/MapTileLayerBase.cs @@ -11,12 +11,16 @@ using System.Windows.Controls; using System.Windows.Media; using System.Windows.Threading; #elif UWP +using Windows.UI.Composition; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; +using Windows.UI.Xaml.Hosting; using Windows.UI.Xaml.Media; #elif WINUI +using Microsoft.UI.Composition; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Hosting; using Microsoft.UI.Xaml.Media; using DispatcherTimer = Microsoft.UI.Dispatching.DispatcherQueueTimer; #endif @@ -68,7 +72,10 @@ namespace MapControl updateTimer.Tick += async (s, e) => await Update(false); MapPanel.SetRenderTransform(this, new MatrixTransform()); -#if UWP || WINUI +#if WPF + RenderOptions.SetEdgeMode(this, EdgeMode.Aliased); +#elif UWP || WINUI + ElementCompositionPreview.GetElementVisual(this).BorderMode = CompositionBorderMode.Hard; MapPanel.InitMapElement(this); #endif } diff --git a/MapControl/WPF/MapBase.WPF.cs b/MapControl/WPF/MapBase.WPF.cs index b7b37265..16c8ce81 100644 --- a/MapControl/WPF/MapBase.WPF.cs +++ b/MapControl/WPF/MapBase.WPF.cs @@ -81,11 +81,6 @@ namespace MapControl FlowDirectionProperty.OverrideMetadata(typeof(MapBase), new FrameworkPropertyMetadata(FlowDirection.LeftToRight) { Inherits = false }); } - public MapBase() - { - RenderOptions.SetEdgeMode(this, EdgeMode.Aliased); - } - /// /// Gets or sets the EasingFunction of the Center, ZoomLevel and Heading animations. /// The default value is a QuadraticEase with EasingMode.EaseOut. diff --git a/MapControl/WinUI/MapBase.WinUI.cs b/MapControl/WinUI/MapBase.WinUI.cs index 42acf8c6..aceee09a 100644 --- a/MapControl/WinUI/MapBase.WinUI.cs +++ b/MapControl/WinUI/MapBase.WinUI.cs @@ -4,16 +4,12 @@ #if UWP using Windows.UI; -using Windows.UI.Composition; using Windows.UI.Xaml; -using Windows.UI.Xaml.Hosting; using Windows.UI.Xaml.Media; using Windows.UI.Xaml.Media.Animation; #else using Microsoft.UI; -using Microsoft.UI.Composition; using Microsoft.UI.Xaml; -using Microsoft.UI.Xaml.Hosting; using Microsoft.UI.Xaml.Media; using Microsoft.UI.Xaml.Media.Animation; #endif @@ -89,8 +85,6 @@ namespace MapControl FlowDirection = FlowDirection.LeftToRight; SizeChanged += OnSizeChanged; - - ElementCompositionPreview.GetElementVisual(this).BorderMode = CompositionBorderMode.Hard; } ///