Browse Source

More cleanup.

pull/5953/head
Dariusz Komosinski 5 years ago
parent
commit
60ad7eae12
  1. 5
      src/Avalonia.Animation/Clock.cs
  2. 24
      src/Avalonia.Animation/TransitionObservableBase.cs

5
src/Avalonia.Animation/Clock.cs

@ -10,10 +10,9 @@ namespace Avalonia.Animation
{
public static IClock GlobalClock => AvaloniaLocator.Current.GetService<IGlobalClock>();
private IDisposable _parentSubscription;
private readonly IDisposable _parentSubscription;
public Clock()
:this(GlobalClock)
public Clock() : this(GlobalClock)
{
}

24
src/Avalonia.Animation/TransitionObservableBase.cs

@ -15,18 +15,6 @@ namespace Avalonia.Animation
_progress = progress;
}
protected override void Unsubscribed()
{
_progressSubscription?.Dispose();
}
protected override void Subscribed()
{
_progressSubscription = _progress.Subscribe(this);
}
protected abstract T ProduceValue(double progress);
void IObserver<double>.OnCompleted()
{
PublishCompleted();
@ -41,5 +29,17 @@ namespace Avalonia.Animation
{
PublishNext(ProduceValue(value));
}
protected override void Unsubscribed()
{
_progressSubscription?.Dispose();
}
protected override void Subscribed()
{
_progressSubscription = _progress.Subscribe(this);
}
protected abstract T ProduceValue(double progress);
}
}

Loading…
Cancel
Save