Merge pull request #7658 from trympet/7657-fix-brush-opacity-animation

fix brush opacity animation

src/Avalonia.Visuals/Animation/Animators/SolidColorBrushAnimator.cs

@@ -12,6 +12,8 @@ namespace Avalonia.Animation.Animators
     /// </summary>
     public class ISolidColorBrushAnimator : Animator<ISolidColorBrush?>
     {
+        private static readonly DoubleAnimator s_doubleAnimator = new DoubleAnimator();
+
         public override ISolidColorBrush? Interpolate(double progress, ISolidColorBrush? oldValue, ISolidColorBrush? newValue)
         {
             if (oldValue is null || newValue is null)
@@ -19,7 +21,9 @@ namespace Avalonia.Animation.Animators
                 return progress >= 0.5 ? newValue : oldValue;
             }
 
-            return new ImmutableSolidColorBrush(ColorAnimator.InterpolateCore(progress, oldValue.Color, newValue.Color));
+            return new ImmutableSolidColorBrush(
+                ColorAnimator.InterpolateCore(progress, oldValue.Color, newValue.Color),
+                s_doubleAnimator.Interpolate(progress, oldValue.Opacity, newValue.Opacity));
         }
 
         public override IDisposable BindAnimation(Animatable control, IObservable<ISolidColorBrush?> instance)

tests/Avalonia.Animation.UnitTests/BrushTransitionTests.cs

@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Media;
+using Xunit;
+
+namespace Avalonia.Animation.UnitTests
+{
+    public class BrushTransitionTests
+    {
+        [Fact]
+        public void SolidColorBrush_Opacity_IsInteroplated()
+        {
+            Test(0, new SolidColorBrush { Opacity = 0 }, new SolidColorBrush { Opacity = 0 });
+            Test(0, new SolidColorBrush { Opacity = 0 }, new SolidColorBrush { Opacity = 1 });
+            Test(0.5, new SolidColorBrush { Opacity = 0 }, new SolidColorBrush { Opacity = 1 });
+            Test(0.5, new SolidColorBrush { Opacity = 0.5 }, new SolidColorBrush { Opacity = 0.5 });
+            Test(1, new SolidColorBrush { Opacity = 1 }, new SolidColorBrush { Opacity = 1 });
+            // TODO: investigate why this case fails.
+            //Test2(1, new SolidColorBrush { Opacity = 0 }, new SolidColorBrush { Opacity = 1 });
+        }
+
+        [Fact]
+        public void LinearGradientBrush_Opacity_IsInteroplated()
+        {
+            Test(0, new LinearGradientBrush { Opacity = 0 }, new LinearGradientBrush { Opacity = 0 });
+            Test(0, new LinearGradientBrush { Opacity = 0 }, new LinearGradientBrush { Opacity = 1 });
+            Test(0.5, new LinearGradientBrush { Opacity = 0 }, new LinearGradientBrush { Opacity = 1 });
+            Test(0.5, new LinearGradientBrush { Opacity = 0.5 }, new LinearGradientBrush { Opacity = 0.5 });
+            Test(1, new LinearGradientBrush { Opacity = 1 }, new LinearGradientBrush { Opacity = 1 });
+        }
+
+        private static void Test(double progress, IBrush oldBrush, IBrush newBrush)
+        {
+            var clock = new TestClock();
+            var border = new Border() { Background = oldBrush };
+            BrushTransition sut = new BrushTransition
+            {
+                Duration = TimeSpan.FromSeconds(1),
+                Property = Border.BackgroundProperty
+            };
+
+            sut.Apply(border, clock, oldBrush, newBrush);
+            clock.Pulse(TimeSpan.Zero);
+            clock.Pulse(sut.Duration * progress);
+
+            Assert.NotNull(border.Background);
+            Assert.Equal(oldBrush.Opacity + (newBrush.Opacity - oldBrush.Opacity) * progress, border.Background.Opacity);
+        }
+    }
+}