Browse Source

make pointer handler protected internal

pull/11518/head
Emmanuel Hansen 3 years ago
parent
commit
9b41e8e8f8
  1. 8
      src/Avalonia.Base/Input/GestureRecognizers/GestureRecognizer.cs
  2. 8
      src/Avalonia.Base/Input/GestureRecognizers/PinchGestureRecognizer.cs
  3. 8
      src/Avalonia.Base/Input/GestureRecognizers/PullGestureRecognizer.cs
  4. 10
      src/Avalonia.Base/Input/GestureRecognizers/ScrollGestureRecognizer.cs

8
src/Avalonia.Base/Input/GestureRecognizers/GestureRecognizer.cs

@ -4,10 +4,10 @@
{
protected internal IInputElement? Target { get; internal set; }
public abstract void PointerPressed(PointerPressedEventArgs e);
public abstract void PointerReleased(PointerReleasedEventArgs e);
public abstract void PointerMoved(PointerEventArgs e);
public abstract void PointerCaptureLost(IPointer pointer);
protected internal abstract void PointerPressed(PointerPressedEventArgs e);
protected internal abstract void PointerReleased(PointerReleasedEventArgs e);
protected internal abstract void PointerMoved(PointerEventArgs e);
protected internal abstract void PointerCaptureLost(IPointer pointer);
protected void Capture(IPointer pointer)
{

8
src/Avalonia.Base/Input/GestureRecognizers/PinchGestureRecognizer.cs

@ -21,12 +21,12 @@ namespace Avalonia.Input
PointerReleased(e);
}
public override void PointerCaptureLost(IPointer pointer)
protected internal override void PointerCaptureLost(IPointer pointer)
{
RemoveContact(pointer);
}
public override void PointerMoved(PointerEventArgs e)
protected internal override void PointerMoved(PointerEventArgs e)
{
if (Target != null && Target is Visual visual)
{
@ -57,7 +57,7 @@ namespace Avalonia.Input
}
}
public override void PointerPressed(PointerPressedEventArgs e)
protected internal override void PointerPressed(PointerPressedEventArgs e)
{
if (Target != null && Target is Visual visual && (e.Pointer.Type == PointerType.Touch || e.Pointer.Type == PointerType.Pen))
{
@ -90,7 +90,7 @@ namespace Avalonia.Input
}
}
public override void PointerReleased(PointerReleasedEventArgs e)
protected internal override void PointerReleased(PointerReleasedEventArgs e)
{
RemoveContact(e.Pointer);
}

8
src/Avalonia.Base/Input/GestureRecognizers/PullGestureRecognizer.cs

@ -30,7 +30,7 @@ namespace Avalonia.Input
public PullGestureRecognizer() { }
public override void PointerCaptureLost(IPointer pointer)
protected internal override void PointerCaptureLost(IPointer pointer)
{
if (_tracking == pointer)
{
@ -38,7 +38,7 @@ namespace Avalonia.Input
}
}
public override void PointerMoved(PointerEventArgs e)
protected internal override void PointerMoved(PointerEventArgs e)
{
if (_tracking == e.Pointer && Target is Visual visual)
{
@ -83,7 +83,7 @@ namespace Avalonia.Input
}
}
public override void PointerPressed(PointerPressedEventArgs e)
protected internal override void PointerPressed(PointerPressedEventArgs e)
{
if (Target != null && Target is Visual visual && (e.Pointer.Type == PointerType.Touch || e.Pointer.Type == PointerType.Pen))
{
@ -118,7 +118,7 @@ namespace Avalonia.Input
}
}
public override void PointerReleased(PointerReleasedEventArgs e)
protected internal override void PointerReleased(PointerReleasedEventArgs e)
{
if (_tracking == e.Pointer && _pullInProgress)
{

10
src/Avalonia.Base/Input/GestureRecognizers/ScrollGestureRecognizer.cs

@ -90,8 +90,8 @@ namespace Avalonia.Input.GestureRecognizers
get => _scrollStartDistance;
set => SetAndRaise(ScrollStartDistanceProperty, ref _scrollStartDistance, value);
}
public override void PointerPressed(PointerPressedEventArgs e)
protected internal override void PointerPressed(PointerPressedEventArgs e)
{
if (e.Pointer.IsPrimary &&
(e.Pointer.Type == PointerType.Touch || e.Pointer.Type == PointerType.Pen))
@ -103,7 +103,7 @@ namespace Avalonia.Input.GestureRecognizers
}
}
public override void PointerMoved(PointerEventArgs e)
protected internal override void PointerMoved(PointerEventArgs e)
{
if (e.Pointer == _tracking)
{
@ -143,7 +143,7 @@ namespace Avalonia.Input.GestureRecognizers
}
}
public override void PointerCaptureLost(IPointer pointer)
protected internal override void PointerCaptureLost(IPointer pointer)
{
if (pointer == _tracking) EndGesture();
}
@ -163,7 +163,7 @@ namespace Avalonia.Input.GestureRecognizers
}
public override void PointerReleased(PointerReleasedEventArgs e)
protected internal override void PointerReleased(PointerReleasedEventArgs e)
{
if (e.Pointer == _tracking && _scrolling)
{

Loading…
Cancel
Save