diff --git a/src/Avalonia.Animation/Animatable.cs b/src/Avalonia.Animation/Animatable.cs index e879f30369..a27d996301 100644 --- a/src/Avalonia.Animation/Animatable.cs +++ b/src/Avalonia.Animation/Animatable.cs @@ -16,7 +16,7 @@ namespace Avalonia.Animation /// /// Base class for control which can have property transitions. /// - public class Animatable : StyledElement + public class Animatable : AvaloniaObject { /// /// Initializes this object. diff --git a/src/Avalonia.Animation/Avalonia.Animation.csproj b/src/Avalonia.Animation/Avalonia.Animation.csproj index e64bf0a7fc..46e41dd32a 100644 --- a/src/Avalonia.Animation/Avalonia.Animation.csproj +++ b/src/Avalonia.Animation/Avalonia.Animation.csproj @@ -4,7 +4,6 @@ - \ No newline at end of file diff --git a/src/Avalonia.Styling/Avalonia.Styling.csproj b/src/Avalonia.Styling/Avalonia.Styling.csproj index 61827bc59c..5aff478971 100644 --- a/src/Avalonia.Styling/Avalonia.Styling.csproj +++ b/src/Avalonia.Styling/Avalonia.Styling.csproj @@ -5,6 +5,7 @@ Avalonia + diff --git a/src/Avalonia.Styling/StyledElement.cs b/src/Avalonia.Styling/StyledElement.cs index 259119eb5f..bd0d0b8c1f 100644 --- a/src/Avalonia.Styling/StyledElement.cs +++ b/src/Avalonia.Styling/StyledElement.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Reactive.Linq; using System.Reactive.Subjects; using System.Text; +using Avalonia.Animation; using Avalonia.Collections; using Avalonia.Controls; using Avalonia.Data; @@ -16,14 +17,14 @@ using Avalonia.Styling; namespace Avalonia { /// - /// Extends an with the following features: + /// Extends an with the following features: /// /// - An inherited . /// - Implements to allow styling to work on the styled element. /// - Implements to form part of a logical tree. /// - A collection of class strings for custom styling. /// - public class StyledElement : AvaloniaObject, IStyledElement, ISetLogicalParent, ISetInheritanceParent + public class StyledElement : Animatable, IStyledElement, ISetLogicalParent, ISetInheritanceParent { /// /// Defines the property.