Browse Source
Merge branch 'master' into respect-success-in-LoadGroupSre
pull/9886/head
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
4 additions and
2 deletions
-
src/Avalonia.Controls/TransitioningContentControl.cs
|
|
@ -69,6 +69,10 @@ public class TransitioningContentControl : ContentControl |
|
|
{ |
|
|
{ |
|
|
Dispatcher.UIThread.Post(() => UpdateContentWithTransition(Content)); |
|
|
Dispatcher.UIThread.Post(() => UpdateContentWithTransition(Content)); |
|
|
} |
|
|
} |
|
|
|
|
|
else if (change.Property == CurrentContentProperty) |
|
|
|
|
|
{ |
|
|
|
|
|
UpdateLogicalTree(change.OldValue, change.NewValue); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
protected override void ContentChanged(AvaloniaPropertyChangedEventArgs e) |
|
|
protected override void ContentChanged(AvaloniaPropertyChangedEventArgs e) |
|
|
@ -94,8 +98,6 @@ public class TransitioningContentControl : ContentControl |
|
|
if (PageTransition != null) |
|
|
if (PageTransition != null) |
|
|
await PageTransition.Start(this, null, true, localToken); |
|
|
await PageTransition.Start(this, null, true, localToken); |
|
|
|
|
|
|
|
|
UpdateLogicalTree(CurrentContent, content); |
|
|
|
|
|
|
|
|
|
|
|
if (localToken.IsCancellationRequested) |
|
|
if (localToken.IsCancellationRequested) |
|
|
{ |
|
|
{ |
|
|
return; |
|
|
return; |
|
|
|
