Fix element being hidden if another animation has started

angelsix · Nov 11, 2017 · 4dc109e · 4dc109e
1 parent 47dfdc0
commit 4dc109e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Source/Fasetto.Word/Animation/FrameworkElementAnimations.cs b/Source/Fasetto.Word/Animation/FrameworkElementAnimations.cs
@@ -110,7 +110,8 @@ public static async Task SlideAndFadeOutAsync(this FrameworkElement element, Ani
             await Task.Delay((int)(seconds * 1000));
 
             // Make element invisible
-            element.Visibility = Visibility.Hidden;
+            if (element.Opacity == 0)
+                element.Visibility = Visibility.Hidden;
         }
 
         #endregion

diff --git a/Source/Fasetto.Word/Animation/StoryboardHelpers.cs b/Source/Fasetto.Word/Animation/StoryboardHelpers.cs
@@ -246,7 +246,6 @@ public static void AddFadeIn(this Storyboard storyboard, float seconds)
             var animation = new DoubleAnimation
             {
                 Duration = new Duration(TimeSpan.FromSeconds(seconds)),
-                From = 0,
                 To = 1,
             };
 
@@ -268,7 +267,6 @@ public static void AddFadeOut(this Storyboard storyboard, float seconds)
             var animation = new DoubleAnimation
             {
                 Duration = new Duration(TimeSpan.FromSeconds(seconds)),
-                From = 1,
                 To = 0,
             };