Browse Source
Merge branch 'master' into themeresource
pull/8166/head
Max Katz
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
6 additions and
2 deletions
-
src/Avalonia.Controls/PullToRefresh/RefreshVisualizer.cs
-
src/Avalonia.Controls/TopLevel.cs
|
|
@ -151,7 +151,11 @@ namespace Avalonia.Controls |
|
|
_content.Loaded += (s, e) => |
|
|
_content.Loaded += (s, e) => |
|
|
{ |
|
|
{ |
|
|
var composition = ElementComposition.GetElementVisual(_content); |
|
|
var composition = ElementComposition.GetElementVisual(_content); |
|
|
var compositor = composition!.Compositor; |
|
|
|
|
|
|
|
|
if(composition == null) |
|
|
|
|
|
return; |
|
|
|
|
|
|
|
|
|
|
|
var compositor = composition.Compositor; |
|
|
composition.Opacity = 0; |
|
|
composition.Opacity = 0; |
|
|
|
|
|
|
|
|
var smoothRotationAnimation |
|
|
var smoothRotationAnimation |
|
|
|
|
|
@ -323,7 +323,7 @@ namespace Avalonia.Controls |
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// Occurs when physical Back Button is pressed or a back navigation has been requested.
|
|
|
/// Occurs when physical Back Button is pressed or a back navigation has been requested.
|
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
public event EventHandler<RoutedEvent> BackRequested |
|
|
public event EventHandler<RoutedEventArgs> BackRequested |
|
|
{ |
|
|
{ |
|
|
add { AddHandler(BackRequestedEvent, value); } |
|
|
add { AddHandler(BackRequestedEvent, value); } |
|
|
remove { RemoveHandler(BackRequestedEvent, value); } |
|
|
remove { RemoveHandler(BackRequestedEvent, value); } |
|
|
|
