Browse Source

Merge pull request #8683 from AvaloniaUI/stop-transition-if-it-was-cancelled

Stop TransitioningContentControl if it was cancelled
pull/8753/head
Max Katz 4 years ago
committed by Dan Walmsley
parent
commit
7627db110a
  1. 10
      src/Avalonia.Controls/TransitioningContentControl.cs

10
src/Avalonia.Controls/TransitioningContentControl.cs

@ -84,13 +84,19 @@ public class TransitioningContentControl : ContentControl
_lastTransitionCts?.Cancel();
_lastTransitionCts = new CancellationTokenSource();
var localToken = _lastTransitionCts.Token;
if (PageTransition != null)
await PageTransition.Start(this, null, true, _lastTransitionCts.Token);
await PageTransition.Start(this, null, true, localToken);
if (localToken.IsCancellationRequested)
{
return;
}
CurrentContent = content;
if (PageTransition != null)
await PageTransition.Start(null, this, true, _lastTransitionCts.Token);
await PageTransition.Start(null, this, true, localToken);
}
}

Loading…
Cancel
Save