Browse Source

fix warnings.

pull/7611/head
Dan Walmsley 4 years ago
parent
commit
4f7edc09fa
  1. 11
      src/Avalonia.Controls/TransitioningContentControl.cs

11
src/Avalonia.Controls/TransitioningContentControl.cs

@ -1,19 +1,20 @@
using System; using System;
using System.Threading; using System.Threading;
using Avalonia.Animation; using Avalonia.Animation;
using Avalonia.Controls.Templates;
using Avalonia.Threading; using Avalonia.Threading;
namespace Avalonia.Controls; namespace Avalonia.Controls;
/// <summary> /// <summary>
/// Displays <see cref="Content"/> according to a <see cref="FuncDataTemplate"/>. /// Displays <see cref="ContentControl.Content"/> according to a <see cref="FuncDataTemplate"/>.
/// Uses <see cref="PageTransition"/> to move between the old and new content values. /// Uses <see cref="PageTransition"/> to move between the old and new content values.
/// </summary> /// </summary>
public class TransitioningContentControl : ContentControl public class TransitioningContentControl : ContentControl
{ {
private CancellationTokenSource? _lastTransitionCts; private CancellationTokenSource? _lastTransitionCts;
private object? _displayedContent; private object? _displayedContent;
/// <summary> /// <summary>
/// Defines the <see cref="PageTransition"/> property. /// Defines the <see cref="PageTransition"/> property.
/// </summary> /// </summary>
@ -28,7 +29,7 @@ public class TransitioningContentControl : ContentControl
public static readonly DirectProperty<TransitioningContentControl, object?> DisplayedContentProperty = public static readonly DirectProperty<TransitioningContentControl, object?> DisplayedContentProperty =
AvaloniaProperty.RegisterDirect<TransitioningContentControl, object?>(nameof(DisplayedContent), AvaloniaProperty.RegisterDirect<TransitioningContentControl, object?>(nameof(DisplayedContent),
o => o.DisplayedContent); o => o.DisplayedContent);
/// <summary> /// <summary>
/// Gets or sets the animation played when content appears and disappears. /// Gets or sets the animation played when content appears and disappears.
/// </summary> /// </summary>
@ -74,7 +75,7 @@ public class TransitioningContentControl : ContentControl
{ {
return; return;
} }
_lastTransitionCts?.Cancel(); _lastTransitionCts?.Cancel();
_lastTransitionCts = new CancellationTokenSource(); _lastTransitionCts = new CancellationTokenSource();
@ -82,7 +83,7 @@ public class TransitioningContentControl : ContentControl
await PageTransition.Start(this, null, true, _lastTransitionCts.Token); await PageTransition.Start(this, null, true, _lastTransitionCts.Token);
DisplayedContent = content; DisplayedContent = content;
if (PageTransition != null) if (PageTransition != null)
await PageTransition.Start(null, this, true, _lastTransitionCts.Token); await PageTransition.Start(null, this, true, _lastTransitionCts.Token);
} }

Loading…
Cancel
Save