Merge branch 'master' of https://github.com/Tyrrrz/MaterialDesignInXamlToolkit into Tyrrrz-master

Author: ButchersBoy

MaterialDesignThemes.Wpf/Transitions/FadeWipe.cs

@@ -23,12 +23,12 @@ public void Wipe(TransitionerSlide fromSlide, TransitionerSlide toSlide, Point o
             var zeroKeyTime = KeyTime.FromTimeSpan(TimeSpan.Zero);
             var endKeyTime = KeyTime.FromTimeSpan(TimeSpan.FromSeconds(Duration.TotalSeconds/2));
 
-            // Old
+            // From
             var fromAnimation = new DoubleAnimationUsingKeyFrames();
             fromAnimation.KeyFrames.Add(new LinearDoubleKeyFrame(1, zeroKeyTime));
             fromAnimation.KeyFrames.Add(new EasingDoubleKeyFrame(0, endKeyTime, _sineEase));
 
-            // New
+            // To
             var toAnimation = new DoubleAnimationUsingKeyFrames();
             toAnimation.KeyFrames.Add(new LinearDoubleKeyFrame(0, zeroKeyTime));
             toAnimation.KeyFrames.Add(new EasingDoubleKeyFrame(1, endKeyTime, _sineEase));
@@ -37,10 +37,22 @@ public void Wipe(TransitionerSlide fromSlide, TransitionerSlide toSlide, Point o
             fromSlide.Opacity = 1;
             toSlide.Opacity = 0;
 
+            // Set up events
+            toAnimation.Completed += (sender, args) =>
+            {
+                toSlide.BeginAnimation(UIElement.OpacityProperty, null);
+                fromSlide.Opacity = 0;
+                toSlide.Opacity = 1;
+            };
+            fromAnimation.Completed += (sender, args) =>
+            {
+                fromSlide.BeginAnimation(UIElement.OpacityProperty, null);
+                fromSlide.Opacity = 0;
+                toSlide.BeginAnimation(UIElement.OpacityProperty, toAnimation);
+            };
+
             // Animate
-            fromAnimation.Completed += (sender, args) => toSlide.BeginAnimation(UIElement.OpacityProperty, toAnimation);
             fromSlide.BeginAnimation(UIElement.OpacityProperty, fromAnimation);
-
             zIndexController.Stack(toSlide, fromSlide);
         }
     }

MaterialDesignThemes.Wpf/Transitions/SlideWipe.cs

@@ -56,30 +56,57 @@ public void Wipe(TransitionerSlide fromSlide, TransitionerSlide toSlide, Point o
                 toStartY = -toSlide.ActualHeight;
             }
 
-            // Old
-            fromSlide.RenderTransform = new TranslateTransform(fromStartX, fromStartY);
+            // From
+            var fromTransform = new TranslateTransform(fromStartX, fromStartY);
+            fromSlide.RenderTransform = fromTransform;
             var fromXAnimation = new DoubleAnimationUsingKeyFrames();
             fromXAnimation.KeyFrames.Add(new LinearDoubleKeyFrame(fromStartX, zeroKeyTime));
             fromXAnimation.KeyFrames.Add(new EasingDoubleKeyFrame(fromEndX, endKeyTime, _sineEase));
             var fromYAnimation = new DoubleAnimationUsingKeyFrames();
             fromYAnimation.KeyFrames.Add(new LinearDoubleKeyFrame(fromStartY, zeroKeyTime));
             fromYAnimation.KeyFrames.Add(new EasingDoubleKeyFrame(fromEndY, endKeyTime, _sineEase));
 
-            // New
-            toSlide.RenderTransform = new TranslateTransform(toStartX, toStartY);
+            // To
+            var toTransform = new TranslateTransform(toStartX, toStartY);
+            toSlide.RenderTransform = toTransform;
             var toXAnimation = new DoubleAnimationUsingKeyFrames();
             toXAnimation.KeyFrames.Add(new LinearDoubleKeyFrame(toStartX, zeroKeyTime));
             toXAnimation.KeyFrames.Add(new EasingDoubleKeyFrame(toEndX, endKeyTime, _sineEase));
             var toYAnimation = new DoubleAnimationUsingKeyFrames();
             toYAnimation.KeyFrames.Add(new LinearDoubleKeyFrame(toStartY, zeroKeyTime));
             toYAnimation.KeyFrames.Add(new EasingDoubleKeyFrame(toEndY, endKeyTime, _sineEase));
 
-            // Animate
-            fromSlide.RenderTransform.BeginAnimation(TranslateTransform.XProperty, fromXAnimation);
-            fromSlide.RenderTransform.BeginAnimation(TranslateTransform.YProperty, fromYAnimation);
-            toSlide.RenderTransform.BeginAnimation(TranslateTransform.XProperty, toXAnimation);
-            toSlide.RenderTransform.BeginAnimation(TranslateTransform.YProperty, toYAnimation);
+            // Set up events
+            fromXAnimation.Completed += (sender, args) =>
+            {
+                fromTransform.BeginAnimation(TranslateTransform.XProperty, null);
+                fromTransform.X = fromEndX;
+                fromSlide.RenderTransform = null;
+            };
+            fromYAnimation.Completed += (sender, args) =>
+            {
+                fromTransform.BeginAnimation(TranslateTransform.YProperty, null);
+                fromTransform.Y = fromEndY;
+                fromSlide.RenderTransform = null;
+            };
+            toXAnimation.Completed += (sender, args) =>
+            {
+                toTransform.BeginAnimation(TranslateTransform.XProperty, null);
+                toTransform.X = toEndX;
+                toSlide.RenderTransform = null;
+            };
+            toYAnimation.Completed += (sender, args) =>
+            {
+                toTransform.BeginAnimation(TranslateTransform.YProperty, null);
+                toTransform.Y = toEndY;
+                toSlide.RenderTransform = null;
+            };
 
+            // Animate
+            fromTransform.BeginAnimation(TranslateTransform.XProperty, fromXAnimation);
+            fromTransform.BeginAnimation(TranslateTransform.YProperty, fromYAnimation);
+            toTransform.BeginAnimation(TranslateTransform.XProperty, toXAnimation);
+            toTransform.BeginAnimation(TranslateTransform.YProperty, toYAnimation);
             zIndexController.Stack(toSlide, fromSlide);
         }
     }