From c12f025552a0755638702a57e4d6cd14535780b5 Mon Sep 17 00:00:00 2001 From: ClemensF Date: Wed, 22 Apr 2020 16:16:17 +0200 Subject: [PATCH] Renamed ImageFadeDuration --- MapControl/Shared/MapBase.cs | 2 +- MapControl/Shared/MapImageLayer.cs | 4 ++-- MapControl/Shared/Tile.cs | 2 +- MapControl/UWP/Tile.UWP.cs | 2 +- MapControl/WPF/Tile.WPF.cs | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MapControl/Shared/MapBase.cs b/MapControl/Shared/MapBase.cs index 15a11c96..78bf8759 100644 --- a/MapControl/Shared/MapBase.cs +++ b/MapControl/Shared/MapBase.cs @@ -33,7 +33,7 @@ namespace MapControl { private const double MaximumZoomLevel = 22d; - public static TimeSpan TileFadeDuration { get; set; } = TimeSpan.FromSeconds(0.1); + public static TimeSpan ImageFadeDuration { get; set; } = TimeSpan.FromSeconds(0.1); public static readonly DependencyProperty MapLayerProperty = DependencyProperty.Register( nameof(MapLayer), typeof(UIElement), typeof(MapBase), diff --git a/MapControl/Shared/MapImageLayer.cs b/MapControl/Shared/MapImageLayer.cs index 0a103e44..8972119d 100644 --- a/MapControl/Shared/MapImageLayer.cs +++ b/MapControl/Shared/MapImageLayer.cs @@ -335,13 +335,13 @@ namespace MapControl topImage.BeginAnimation(OpacityProperty, new DoubleAnimation { To = 1d, - Duration = MapBase.TileFadeDuration + Duration = MapBase.ImageFadeDuration }); bottomImage.BeginAnimation(OpacityProperty, new DoubleAnimation { To = 0d, - BeginTime = MapBase.TileFadeDuration, + BeginTime = MapBase.ImageFadeDuration, Duration = TimeSpan.Zero }); } diff --git a/MapControl/Shared/Tile.cs b/MapControl/Shared/Tile.cs index 17928694..592abba6 100644 --- a/MapControl/Shared/Tile.cs +++ b/MapControl/Shared/Tile.cs @@ -48,7 +48,7 @@ namespace MapControl { From = 0d, To = 1d, - Duration = MapBase.TileFadeDuration, + Duration = MapBase.ImageFadeDuration, FillBehavior = FillBehavior.Stop }); diff --git a/MapControl/UWP/Tile.UWP.cs b/MapControl/UWP/Tile.UWP.cs index 43921b9f..ae186b3c 100644 --- a/MapControl/UWP/Tile.UWP.cs +++ b/MapControl/UWP/Tile.UWP.cs @@ -16,7 +16,7 @@ namespace MapControl { Pending = false; - if (fadeIn && MapBase.TileFadeDuration > TimeSpan.Zero) + if (fadeIn && MapBase.ImageFadeDuration > TimeSpan.Zero) { if (image is BitmapImage bitmap && bitmap.UriSource != null) { diff --git a/MapControl/WPF/Tile.WPF.cs b/MapControl/WPF/Tile.WPF.cs index 1e4f43c5..f2d5af31 100644 --- a/MapControl/WPF/Tile.WPF.cs +++ b/MapControl/WPF/Tile.WPF.cs @@ -15,7 +15,7 @@ namespace MapControl { Pending = false; - if (fadeIn && MapBase.TileFadeDuration > TimeSpan.Zero) + if (fadeIn && MapBase.ImageFadeDuration > TimeSpan.Zero) { if (image is BitmapSource bitmap && !bitmap.IsFrozen && bitmap.IsDownloading) {