Browse Source

Merge branch 'master' into themeresource

pull/8166/head
Max Katz 4 years ago
committed by GitHub
parent
commit
27f14d3581
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      src/Avalonia.Controls/PullToRefresh/RefreshVisualizer.cs
  2. 2
      src/Avalonia.Controls/TopLevel.cs

6
src/Avalonia.Controls/PullToRefresh/RefreshVisualizer.cs

@ -151,7 +151,11 @@ namespace Avalonia.Controls
_content.Loaded += (s, e) =>
{
var composition = ElementComposition.GetElementVisual(_content);
var compositor = composition!.Compositor;
if(composition == null)
return;
var compositor = composition.Compositor;
composition.Opacity = 0;
var smoothRotationAnimation

2
src/Avalonia.Controls/TopLevel.cs

@ -323,7 +323,7 @@ namespace Avalonia.Controls
/// <summary>
/// Occurs when physical Back Button is pressed or a back navigation has been requested.
/// </summary>
public event EventHandler<RoutedEvent> BackRequested
public event EventHandler<RoutedEventArgs> BackRequested
{
add { AddHandler(BackRequestedEvent, value); }
remove { RemoveHandler(BackRequestedEvent, value); }

Loading…
Cancel
Save