Browse Source

Clean up naming in TransformAnimator.

pull/1715/head
Jeremy Koritzinsky 8 years ago
parent
commit
6b0ef13027
  1. 18
      src/Avalonia.Visuals/Animation/TransformAnimator.cs

18
src/Avalonia.Visuals/Animation/TransformAnimator.cs

@ -9,7 +9,7 @@ namespace Avalonia.Animation
/// </summary>
public class TransformAnimator : Animator<double>
{
DoubleAnimator childKeyFrames;
DoubleAnimator childAnimator;
/// <inheritdoc/>
public override IDisposable Apply(Animation animation, Animatable control, IClock clock, IObservable<bool> obsMatch, Action onComplete)
@ -36,15 +36,15 @@ namespace Avalonia.Animation
var renderTransformType = ctrl.RenderTransform.GetType();
if (childKeyFrames == null)
if (childAnimator == null)
{
InitializeChildKeyFrames();
InitializeChildAnimator();
}
// It's a transform object so let's target that.
if (renderTransformType == Property.OwnerType)
{
return childKeyFrames.Apply(animation, ctrl.RenderTransform, clock ?? control.Clock, obsMatch, onComplete);
return childAnimator.Apply(animation, ctrl.RenderTransform, clock ?? control.Clock, obsMatch, onComplete);
}
// It's a TransformGroup and try finding the target there.
else if (renderTransformType == typeof(TransformGroup))
@ -53,7 +53,7 @@ namespace Avalonia.Animation
{
if (transform.GetType() == Property.OwnerType)
{
return childKeyFrames.Apply(animation, transform, clock ?? control.Clock, obsMatch, onComplete);
return childAnimator.Apply(animation, transform, clock ?? control.Clock, obsMatch, onComplete);
}
}
}
@ -73,16 +73,16 @@ namespace Avalonia.Animation
return null;
}
void InitializeChildKeyFrames()
void InitializeChildAnimator()
{
childKeyFrames = new DoubleAnimator();
childAnimator = new DoubleAnimator();
foreach (AnimatorKeyFrame keyframe in this)
{
childKeyFrames.Add(keyframe);
childAnimator.Add(keyframe);
}
childKeyFrames.Property = Property;
childAnimator.Property = Property;
}
/// <inheritdocs/>

Loading…
Cancel
Save