change show and hide animation of overlay page

Scighost · Dec 29, 2023 · 685dab7 · 685dab7
1 parent 4faf70d
commit 685dab7
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 16 deletions.
diff --git a/src/Starward/MyWindows/MainWindow.xaml b/src/Starward/MyWindows/MainWindow.xaml
@@ -15,7 +15,7 @@
 
     <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 
-        <sp:MainPage Name="mainPage" />
+        <sp:MainPage x:Name="mainPage" />
 
         <Frame Name="Frame_Overlay"
                IsNavigationStackEnabled="False"

diff --git a/src/Starward/MyWindows/MainWindow.xaml.cs b/src/Starward/MyWindows/MainWindow.xaml.cs
@@ -3,11 +3,13 @@
 
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Media.Animation;
 using Starward.Pages;
 using System;
 using System.Diagnostics;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using Vanara.PInvoke;
 using Windows.Graphics;
@@ -103,22 +105,62 @@ private void MainWindow_Closed(object sender, WindowEventArgs args)
     }
 
 
-    public void OverlayFrameNavigateTo(Type page, object? parameter, NavigationTransitionInfo infoOverride)
+
+    private CancellationTokenSource overlayCancelTokenSource;
+
+
+    public void OverlayFrameNavigateTo(Type page, object? parameter)
     {
-        MainPage.Current?.PauseVideo();
-        Frame_Overlay.Visibility = Visibility.Visible;
-        Frame_Overlay.Navigate(page, parameter!, infoOverride);
-        var len = (int)(48 * UIScale);
-        SetDragRectangles(new RectInt32(0, 0, 100000, len));
+        try
+        {
+            overlayCancelTokenSource?.Cancel();
+            overlayCancelTokenSource = new CancellationTokenSource();
+            MainPage.Current?.PauseVideo();
+            Frame_Overlay.Visibility = Visibility.Visible;
+            Frame_Overlay.Navigate(page, parameter!, new SuppressNavigationTransitionInfo());
+            if (Frame_Overlay.Content is UIElement element)
+            {
+                element.Transitions = [new EntranceThemeTransition { FromVerticalOffset = 600 }];
+            }
+            SetDragRectangles(new RectInt32(0, 0, 100000, (int)(48 * UIScale)));
+        }
+        catch { }
     }
 
 
     public void CloseOverlayPage()
     {
-        MainPage.Current?.PlayVideo();
-        Frame_Overlay.Visibility = Visibility.Collapsed;
-        Frame_Overlay.Content = null;
-        MainPage.Current?.UpdateDragRectangles();
+        try
+        {
+            if (Frame_Overlay.Content is UIElement element)
+            {
+                var token = overlayCancelTokenSource?.Token ?? CancellationToken.None;
+                var tt = new TranslateTransform();
+                element.RenderTransform = tt;
+                var da = new DoubleAnimation
+                {
+                    To = Frame_Overlay.ActualHeight,
+                    Duration = new Duration(TimeSpan.FromMilliseconds(600)),
+                    EasingFunction = new BackEase(),
+                };
+                Storyboard.SetTarget(da, tt);
+                Storyboard.SetTargetProperty(da, nameof(tt.Y));
+                var sb = new Storyboard { Duration = new Duration(TimeSpan.FromMilliseconds(600)) };
+                sb.Children.Add(da);
+                sb.Completed += (_, _) =>
+                {
+                    if (token.IsCancellationRequested)
+                    {
+                        return;
+                    }
+                    Frame_Overlay.Visibility = Visibility.Collapsed;
+                    Frame_Overlay.Content = null;
+                    MainPage.Current?.UpdateDragRectangles();
+                };
+                sb.Begin();
+            }
+        }
+        catch { }
     }
 
 

diff --git a/src/Starward/Pages/MainPage.xaml.cs b/src/Starward/Pages/MainPage.xaml.cs
@@ -128,7 +128,7 @@ private async Task CheckUpdateAsync()
             var release = await _updateService.CheckUpdateAsync(false);
             if (release != null)
             {
-                MainWindow.Current.OverlayFrameNavigateTo(typeof(UpdatePage), release, new DrillInNavigationTransitionInfo());
+                MainWindow.Current.OverlayFrameNavigateTo(typeof(UpdatePage), release);
             }
         }
         catch (HttpRequestException ex)
@@ -779,7 +779,7 @@ private async void NavigationView_ItemInvoked(NavigationView sender, NavigationV
                 }
                 if (item.Tag is nameof(SettingPage))
                 {
-                    MainWindow.Current.OverlayFrameNavigateTo(typeof(Setting.SettingPage), null, new SuppressNavigationTransitionInfo());
+                    MainWindow.Current.OverlayFrameNavigateTo(typeof(SettingPage), null);
                     await Task.Delay(1);
                     sender.SelectedItem = null;
                     return;
@@ -959,7 +959,7 @@ private void ShortcutNavigate(int num)
     {
         if (num == 0)
         {
-            MainWindow.Current.OverlayFrameNavigateTo(typeof(Setting.SettingPage), null, new SuppressNavigationTransitionInfo());
+            MainWindow.Current.OverlayFrameNavigateTo(typeof(SettingPage), null);
         }
         if (CurrentGameBiz.ToGame() == GameBiz.None)
         {

diff --git a/src/Starward/Pages/ScreenshotPage.xaml.cs b/src/Starward/Pages/ScreenshotPage.xaml.cs
@@ -216,7 +216,7 @@ private void GridView_Images_ItemClick(object sender, ItemClickEventArgs e)
             if (e.ClickedItem is ScreenshotItem item && Watcher is not null)
             {
                 var list = Watcher.ImageList.ToList();
-                MainWindow.Current.OverlayFrameNavigateTo(typeof(ImageViewPage), (item, list), new DrillInNavigationTransitionInfo());
+                MainWindow.Current.OverlayFrameNavigateTo(typeof(ImageViewPage), (item, list));
             }
         }
         catch { }

diff --git a/src/Starward/Pages/Setting/AboutSettingPage.xaml.cs b/src/Starward/Pages/Setting/AboutSettingPage.xaml.cs
@@ -61,7 +61,7 @@ private async Task CheckUpdateAsync()
             var release = await _updateService.CheckUpdateAsync(true);
             if (release != null)
             {
-                MainWindow.Current.OverlayFrameNavigateTo(typeof(UpdatePage), release, new SlideNavigationTransitionInfo());
+                MainWindow.Current.OverlayFrameNavigateTo(typeof(UpdatePage), release);
             }
             else
             {