Max Katz
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
8 additions and
2 deletions
-
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); |
|
|
|
} |
|
|
|
} |
|
|
|
|
