Merge pull request #4311 from Sergio0694/bugfix/xaml-animation-glitches

Sergio0694 · web-flow · commit 83bcf26dfa20 · 2021-10-13T02:02:09.000+02:00
Fixed incorrect default easing for XAML animation types
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Abstract/Animation{TValue,TKeyFrame}.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Abstract/Animation{TValue,TKeyFrame}.cs
@@ -142,7 +142,7 @@ protected INormalizedKeyFrameAnimationBuilder<TKeyFrame> AppendToBuilder(INormal
 
             if (from is not null)
             {
-                builder.KeyFrame(0.0, from.Value, default, default);
+                builder.KeyFrame(0.0, from.Value);
             }
 
             return builder;
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Abstract/ImplicitAnimation{TValue,TKeyFrame}.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Abstract/ImplicitAnimation{TValue,TKeyFrame}.cs
@@ -74,7 +74,7 @@ public CompositionAnimation GetAnimation(UIElement element, out string? target)
 
                 if (from is not null)
                 {
-                    builder.KeyFrame(0.0, from.Value, default, default);
+                    builder.KeyFrame(0.0, from.Value, DefaultEasingType, DefaultEasingMode);
                 }
 
                 foreach (var keyFrame in KeyFrames)

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ protected INormalizedKeyFrameAnimationBuilder<TKeyFrame> AppendToBuilder(INormal`
`142`	`142`
`143`	`143`	`if (from is not null)`
`144`	`144`	`{`
`145`		`- builder.KeyFrame(0.0, from.Value, default, default);`
	`145`	`+ builder.KeyFrame(0.0, from.Value);`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`return builder;`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public CompositionAnimation GetAnimation(UIElement element, out string? target)`
`74`	`74`
`75`	`75`	`if (from is not null)`
`76`	`76`	`{`
`77`		`- builder.KeyFrame(0.0, from.Value, default, default);`
	`77`	`+ builder.KeyFrame(0.0, from.Value, DefaultEasingType, DefaultEasingMode);`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`foreach (var keyFrame in KeyFrames)`