From 01a2e7324a0f44c4314ef149717ae6c7336de460 Mon Sep 17 00:00:00 2001 From: Jumar Macato <16554748+jmacato@users.noreply.github.com> Date: Thu, 22 Feb 2024 14:23:35 +0800 Subject: [PATCH] remove extra fields --- .../Animation/Animators/TransformAnimator.cs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Avalonia.Base/Animation/Animators/TransformAnimator.cs b/src/Avalonia.Base/Animation/Animators/TransformAnimator.cs index 6941e14384..f184b66de0 100644 --- a/src/Avalonia.Base/Animation/Animators/TransformAnimator.cs +++ b/src/Avalonia.Base/Animation/Animators/TransformAnimator.cs @@ -12,10 +12,7 @@ namespace Avalonia.Animation.Animators /// internal class TransformAnimator : Animator { - private Transform? _targetTransform; - private AvaloniaProperty? _targetProperty; private LightweightSubject? _subject2; - private DisposeAnimationInstanceSubject? _subject1; /// public override IDisposable? Apply(Animation animation, Animatable control, IClock? clock, IObservable match, Action? onComplete) @@ -54,9 +51,11 @@ namespace Avalonia.Animation.Animators var renderTransformType = ctrl.RenderTransform.GetType(); - _targetProperty = Property; + var _targetProperty = Property; // It's a transform object so let's target that. + Transform? _targetTransform = null; + if (renderTransformType == Property.OwnerType) { _targetTransform = (Transform)ctrl.RenderTransform; @@ -77,7 +76,7 @@ namespace Avalonia.Animation.Animators if (_targetTransform is not null) { - _subject1 = new DisposeAnimationInstanceSubject(this, animation, + var _subject1 = new DisposeAnimationInstanceSubject(this, animation, control, clock, onComplete); _subject2 = new LightweightSubject(); @@ -107,6 +106,5 @@ namespace Avalonia.Animation.Animators _subject2?.OnNext(((newValue - oldValue) * progress) + oldValue); return default; } - } }