ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2026-04-05 22:46:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reworked animations

Browse source
This commit is contained in:
ClemensFischer 2024-05-21 22:05:01 +02:00
parent 12b33c5376
commit 8708c7ffe6
9 changed files with 159 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

23
MapControl/Shared/MapImageLayer.cs
View file

@ -17,19 +17,16 @@ using Windows.Foundation;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Media.Animation;
using DispatcherTimer = Microsoft.UI.Dispatching.DispatcherQueueTimer;
#elif UWP
using Windows.Foundation;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Media.Animation;
#else
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
using System.Windows.Media.Animation;
using System.Windows.Threading;
#endif
@ -209,7 +206,7 @@ namespace MapControl
}
}
SwapImages(image, boundingBox);
await SwapImages(image, boundingBox);
updateInProgress = false;
}
@ -241,7 +238,7 @@ namespace MapControl
}
}
private void SwapImages(ImageSource image, BoundingBox boundingBox)
private async Task SwapImages(ImageSource image, BoundingBox boundingBox)
{
if (Children.Count >= 2)
{
@ -254,21 +251,7 @@ namespace MapControl
topImage.Source = image;
SetBoundingBox(topImage, boundingBox);
#if AVALONIA
#else
topImage.BeginAnimation(OpacityProperty, new DoubleAnimation
{
To = 1d,
Duration = MapBase.ImageFadeDuration
});
bottomImage.BeginAnimation(OpacityProperty, new DoubleAnimation
{
To = 0d,
BeginTime = MapBase.ImageFadeDuration,
Duration = TimeSpan.Zero
});
#endif
await OpacityHelper.SwapOpacities(topImage, bottomImage);
}
}
}