Browse Source

Move Avalonia.Styling to be below Avalonia.Animation in the dependency chain per conversation in Gitter.

pull/1594/head
Jeremy Koritzinsky 8 years ago
parent
commit
61ebeb2ac9
  1. 2
      src/Avalonia.Animation/Animatable.cs
  2. 1
      src/Avalonia.Animation/Avalonia.Animation.csproj
  3. 5
      src/Avalonia.Styling/StyledElement.cs

2
src/Avalonia.Animation/Animatable.cs

@ -16,7 +16,7 @@ namespace Avalonia.Animation
/// <summary> /// <summary>
/// Base class for control which can have property transitions. /// Base class for control which can have property transitions.
/// </summary> /// </summary>
public class Animatable : AvaloniaObject public class Animatable : StyledElement
{ {
/// <summary> /// <summary>
/// Initializes this <see cref="Animatable"/> object. /// Initializes this <see cref="Animatable"/> object.

1
src/Avalonia.Animation/Avalonia.Animation.csproj

@ -4,6 +4,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" /> <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
<ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
</ItemGroup> </ItemGroup>
<Import Project="..\..\build\Rx.props" /> <Import Project="..\..\build\Rx.props" />
</Project> </Project>

5
src/Avalonia.Styling/StyledElement.cs

@ -5,7 +5,6 @@ using System.Linq;
using System.Reactive.Linq; using System.Reactive.Linq;
using System.Reactive.Subjects; using System.Reactive.Subjects;
using System.Text; using System.Text;
using Avalonia.Animation;
using Avalonia.Collections; using Avalonia.Collections;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Data; using Avalonia.Data;
@ -17,14 +16,14 @@ using Avalonia.Styling;
namespace Avalonia namespace Avalonia
{ {
/// <summary> /// <summary>
/// Extends an <see cref="Animatable"/> with the following features: /// Extends an <see cref="AvaloniaObject"/> with the following features:
/// ///
/// - An inherited <see cref="DataContext"/>. /// - An inherited <see cref="DataContext"/>.
/// - Implements <see cref="IStyleable"/> to allow styling to work on the styled element. /// - Implements <see cref="IStyleable"/> to allow styling to work on the styled element.
/// - Implements <see cref="ILogical"/> to form part of a logical tree. /// - Implements <see cref="ILogical"/> to form part of a logical tree.
/// - A collection of class strings for custom styling. /// - A collection of class strings for custom styling.
/// </summary> /// </summary>
public class StyledElement : Animatable, IStyledElement, ISetLogicalParent, ISetInheritanceParent public class StyledElement : AvaloniaObject, IStyledElement, ISetLogicalParent, ISetInheritanceParent
{ {
/// <summary> /// <summary>
/// Defines the <see cref="DataContext"/> property. /// Defines the <see cref="DataContext"/> property.

Loading…
Cancel
Save