From 8f203c6800c3d5cc2e5b9332c7376574e1fa4747 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?=
 <wieslawsoltes@users.noreply.github.com>
Date: Tue, 15 Jun 2021 21:57:25 +0200
Subject: [PATCH] Add Animator property to Setter

---
 src/Avalonia.Animation/Animation.cs        | 2 +-
 src/Avalonia.Animation/IAnimationSetter.cs | 3 +++
 src/Avalonia.Styling/Styling/Setter.cs     | 5 +++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Animation/Animation.cs b/src/Avalonia.Animation/Animation.cs
index c42153ec4f..07b8c1a54e 100644
--- a/src/Avalonia.Animation/Animation.cs
+++ b/src/Avalonia.Animation/Animation.cs
@@ -248,7 +248,7 @@ namespace Avalonia.Animation
             {
                 foreach (var setter in keyframe.Setters)
                 {
-                    var handler = GetAnimatorType(setter.Property);
+                    var handler = setter.Animator ?? GetAnimatorType(setter.Property);
 
                     if (handler == null)
                     {
diff --git a/src/Avalonia.Animation/IAnimationSetter.cs b/src/Avalonia.Animation/IAnimationSetter.cs
index 2d22377286..072d7096ae 100644
--- a/src/Avalonia.Animation/IAnimationSetter.cs
+++ b/src/Avalonia.Animation/IAnimationSetter.cs
@@ -1,8 +1,11 @@
+using System;
+
 namespace Avalonia.Animation
 {
     public interface IAnimationSetter
     {
         AvaloniaProperty Property { get; set; }
         object Value { get; set; }
+        Type Animator { get; set; }
     }
 }
diff --git a/src/Avalonia.Styling/Styling/Setter.cs b/src/Avalonia.Styling/Styling/Setter.cs
index 1f3d6335a9..114a97dbb6 100644
--- a/src/Avalonia.Styling/Styling/Setter.cs
+++ b/src/Avalonia.Styling/Styling/Setter.cs
@@ -59,6 +59,11 @@ namespace Avalonia.Styling
             }
         }
 
+        /// <summary>
+        /// Gets or sets the property animator.
+        /// </summary>
+        public Type? Animator { get; set; }
+
         public ISetterInstance Instance(IStyleable target)
         {
             target = target ?? throw new ArgumentNullException(nameof(target));