浏览代码

Merge pull request #12364 from Coloryr/master

Make the animation display complete
Jumar Macato 2 年之前
父节点
当前提交
ef1093a970
共有 1 个文件被更改,包括 26 次插入0 次删除
  1. 26 0
      src/Avalonia.Base/Animation/CrossFade.cs

+ 26 - 0
src/Avalonia.Base/Animation/CrossFade.cs

@@ -35,6 +35,18 @@ namespace Avalonia.Animation
             {
                 Children =
                 {
+                    new KeyFrame()
+                    {
+                        Setters =
+                        {
+                            new Setter
+                            {
+                                Property = Visual.OpacityProperty,
+                                Value = 1d
+                            }
+                        },
+                        Cue = new Cue(0d)
+                    },
                     new KeyFrame()
                     {
                         Setters =
@@ -54,6 +66,18 @@ namespace Avalonia.Animation
             {
                 Children =
                 {
+                    new KeyFrame()
+                    {
+                        Setters =
+                        {
+                            new Setter
+                            {
+                                Property = Visual.OpacityProperty,
+                                Value = 0d
+                            }
+                        },
+                        Cue = new Cue(0d)
+                    },
                     new KeyFrame()
                     {
                         Setters =
@@ -117,11 +141,13 @@ namespace Avalonia.Animation
 
                 if (from != null)
                 {
+                    from.Opacity = 0f;
                     tasks.Add(_fadeOutAnimation.RunAsync(from, null, cancellationToken));
                 }
 
                 if (to != null)
                 {
+                    to.Opacity = 1f;
                     to.IsVisible = true;
                     tasks.Add(_fadeInAnimation.RunAsync(to, null, cancellationToken));
                 }