From 9b41e8e8f820fdc7c3c7c6bcb59535f0122f0a48 Mon Sep 17 00:00:00 2001 From: Emmanuel Hansen Date: Tue, 30 May 2023 10:07:15 +0000 Subject: [PATCH] make pointer handler protected internal --- .../Input/GestureRecognizers/GestureRecognizer.cs | 8 ++++---- .../Input/GestureRecognizers/PinchGestureRecognizer.cs | 8 ++++---- .../Input/GestureRecognizers/PullGestureRecognizer.cs | 8 ++++---- .../GestureRecognizers/ScrollGestureRecognizer.cs | 10 +++++----- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Avalonia.Base/Input/GestureRecognizers/GestureRecognizer.cs b/src/Avalonia.Base/Input/GestureRecognizers/GestureRecognizer.cs index c7f40b4468..e96c397d11 100644 --- a/src/Avalonia.Base/Input/GestureRecognizers/GestureRecognizer.cs +++ b/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) { diff --git a/src/Avalonia.Base/Input/GestureRecognizers/PinchGestureRecognizer.cs b/src/Avalonia.Base/Input/GestureRecognizers/PinchGestureRecognizer.cs index b5342ae180..b12c2cc701 100644 --- a/src/Avalonia.Base/Input/GestureRecognizers/PinchGestureRecognizer.cs +++ b/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); } diff --git a/src/Avalonia.Base/Input/GestureRecognizers/PullGestureRecognizer.cs b/src/Avalonia.Base/Input/GestureRecognizers/PullGestureRecognizer.cs index 4d463203e6..5358eb4cda 100644 --- a/src/Avalonia.Base/Input/GestureRecognizers/PullGestureRecognizer.cs +++ b/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) { diff --git a/src/Avalonia.Base/Input/GestureRecognizers/ScrollGestureRecognizer.cs b/src/Avalonia.Base/Input/GestureRecognizers/ScrollGestureRecognizer.cs index 2f2afd5289..80c0583d90 100644 --- a/src/Avalonia.Base/Input/GestureRecognizers/ScrollGestureRecognizer.cs +++ b/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) {