Browse Source

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

This reverts commit 867ecc05b6e7f94e08389e7f8383f61d488e1245.
pull/1594/head
Jeremy Koritzinsky 8 years ago
parent
commit
9ff429879f
  1. 2
      src/Avalonia.Animation/Animatable.cs
  2. 1
      src/Avalonia.Animation/Avalonia.Animation.csproj
  3. 1
      src/Avalonia.Styling/Avalonia.Styling.csproj
  4. 5
      src/Avalonia.Styling/StyledElement.cs

2
src/Avalonia.Animation/Animatable.cs

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

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

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

1
src/Avalonia.Styling/Avalonia.Styling.csproj

@ -5,6 +5,7 @@
<RootNamespace>Avalonia</RootNamespace>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
<ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
<ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
<ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />

5
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
{
/// <summary>
/// Extends an <see cref="AvaloniaObject"/> with the following features:
/// Extends an <see cref="Animatable"/> with the following features:
///
/// - An inherited <see cref="DataContext"/>.
/// - Implements <see cref="IStyleable"/> to allow styling to work on the styled element.
/// - Implements <see cref="ILogical"/> to form part of a logical tree.
/// - A collection of class strings for custom styling.
/// </summary>
public class StyledElement : AvaloniaObject, IStyledElement, ISetLogicalParent, ISetInheritanceParent
public class StyledElement : Animatable, IStyledElement, ISetLogicalParent, ISetInheritanceParent
{
/// <summary>
/// Defines the <see cref="DataContext"/> property.

Loading…
Cancel
Save