Browse Source

Merge branch 'master' into scroll_snap

pull/9961/head
Jumar Macato 4 years ago
committed by GitHub
parent
commit
2278b33394
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
  3. 2
      src/iOS/Avalonia.iOS/TextInputResponder.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

@ -318,7 +318,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); }

2
src/iOS/Avalonia.iOS/TextInputResponder.cs

@ -445,7 +445,7 @@ partial class AvaloniaView
UITextPosition IUITextInput.BeginningOfDocument => _beginningOfDocument;
private int DocumentLength => _client.SurroundingText.Text.Length + (_markedText?.Length ?? 0);
private int DocumentLength => (_client.SurroundingText.Text?.Length ?? 0) + (_markedText?.Length ?? 0);
UITextPosition IUITextInput.EndOfDocument => new AvaloniaTextPosition(DocumentLength);
UITextRange IUITextInput.MarkedTextRange

Loading…
Cancel
Save