SteamScreenshots: Add fade out animation before window is closed

darklinkpower · Dec 9, 2024 · f0bd825 · f0bd825
1 parent 83e20f3
commit f0bd825
Showing 1 changed file with 23 additions and 4 deletions.
diff --git a/source/Generic/SteamScreenshots/ScreenshotsView/ScreenshotsViewModel.cs b/source/Generic/SteamScreenshots/ScreenshotsView/ScreenshotsViewModel.cs
@@ -167,9 +167,6 @@ private void FadeImages()
                     Storyboard.SetTarget(_fadeInAnimation, content.ImageB);
                 }
 
-                Storyboard.SetTargetProperty(_fadeOutAnimation, new PropertyPath("Opacity"));
-                Storyboard.SetTargetProperty(_fadeInAnimation, new PropertyPath("Opacity"));
-
                 var storyboard = new Storyboard();
                 storyboard.Children.Add(_fadeOutAnimation);
                 storyboard.Children.Add(_fadeInAnimation);
@@ -179,7 +176,26 @@ private void FadeImages()
 
         private void CloseWindow()
         {
-            _window.Close();
+            if (_window.Content is ScreenshotsView content)
+            {
+                if (_lastImageSet == ImageIdentifier.ImageA)
+                {
+                    Storyboard.SetTarget(_fadeOutAnimation, content.ImageA);
+                }
+                else
+                {
+                    Storyboard.SetTarget(_fadeOutAnimation, content.ImageB);
+                }
+
+                var storyboard = new Storyboard();
+                storyboard.Children.Add(_fadeOutAnimation);
+                storyboard.Completed += (s, e) => _window.Close();
+                storyboard.Begin();
+            }
+            else
+            {
+                _window.Close();
+            }    
         }
 
         private bool CanNavigate()
@@ -228,6 +244,9 @@ private void InitializeAnimations()
                 Duration = TimeSpan.FromSeconds(0.25),
                 FillBehavior = FillBehavior.HoldEnd
             };
+
+            Storyboard.SetTargetProperty(_fadeOutAnimation, new PropertyPath("Opacity"));
+            Storyboard.SetTargetProperty(_fadeInAnimation, new PropertyPath("Opacity"));
         }
 
         public event PropertyChangedEventHandler PropertyChanged;