Browse Source

Remove Unstable from several RoutedEventArgs (#20955)

pull/20549/merge
Julien Lebosquain 4 days ago
committed by GitHub
parent
commit
0ce664fae0
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 2
      src/Avalonia.Base/Input/DragEventArgs.cs
  2. 4
      src/Avalonia.Base/Input/PointerDeltaEventArgs.cs
  3. 17
      src/Avalonia.Base/Input/PointerEventArgs.cs
  4. 8
      src/Avalonia.Base/Input/PointerWheelEventArgs.cs

2
src/Avalonia.Base/Input/DragEventArgs.cs

@ -1,6 +1,5 @@
using System; using System;
using Avalonia.Interactivity; using Avalonia.Interactivity;
using Avalonia.Metadata;
namespace Avalonia.Input namespace Avalonia.Input
{ {
@ -25,7 +24,6 @@ namespace Avalonia.Input
return _target.TranslatePoint(_targetLocation, relativeTo) ?? new Point(0, 0); return _target.TranslatePoint(_targetLocation, relativeTo) ?? new Point(0, 0);
} }
[Unstable("This constructor might be removed in 12.0. For unit testing, consider using DragDrop.DoDragDrop or IHeadlessWindow.DragDrop.")]
public DragEventArgs( public DragEventArgs(
RoutedEvent<DragEventArgs>? routedEvent, RoutedEvent<DragEventArgs>? routedEvent,
IDataTransfer dataTransfer, IDataTransfer dataTransfer,

4
src/Avalonia.Base/Input/PointerDeltaEventArgs.cs

@ -1,7 +1,4 @@
using System;
using Avalonia.Interactivity; using Avalonia.Interactivity;
using Avalonia.Metadata;
using Avalonia.VisualTree;
namespace Avalonia.Input namespace Avalonia.Input
{ {
@ -9,7 +6,6 @@ namespace Avalonia.Input
{ {
public Vector Delta { get; } public Vector Delta { get; }
[Unstable("This constructor might be removed in 12.0.")]
public PointerDeltaEventArgs(RoutedEvent? routedEvent, object? source, public PointerDeltaEventArgs(RoutedEvent? routedEvent, object? source,
IPointer pointer, Visual rootVisual, Point rootVisualPosition, ulong timestamp, IPointer pointer, Visual rootVisual, Point rootVisualPosition, ulong timestamp,
PointerPointProperties properties, KeyModifiers modifiers, Vector delta) PointerPointProperties properties, KeyModifiers modifiers, Vector delta)

17
src/Avalonia.Base/Input/PointerEventArgs.cs

@ -14,7 +14,6 @@ namespace Avalonia.Input
private readonly PointerPointProperties _properties; private readonly PointerPointProperties _properties;
private readonly Lazy<IReadOnlyList<RawPointerPoint>?>? _previousPoints; private readonly Lazy<IReadOnlyList<RawPointerPoint>?>? _previousPoints;
[Unstable("This constructor might be removed in 12.0. For unit testing, consider using IHeadlessWindow mouse methods.")]
public PointerEventArgs(RoutedEvent? routedEvent, public PointerEventArgs(RoutedEvent? routedEvent,
object? source, object? source,
IPointer pointer, IPointer pointer,
@ -33,7 +32,8 @@ namespace Avalonia.Input
KeyModifiers = modifiers; KeyModifiers = modifiers;
} }
internal PointerEventArgs(RoutedEvent? routedEvent, [PrivateApi]
public PointerEventArgs(RoutedEvent? routedEvent,
object? source, object? source,
IPointer pointer, IPointer pointer,
Visual? rootVisual, Point rootVisualPosition, Visual? rootVisual, Point rootVisualPosition,
@ -41,9 +41,7 @@ namespace Avalonia.Input
PointerPointProperties properties, PointerPointProperties properties,
KeyModifiers modifiers, KeyModifiers modifiers,
Lazy<IReadOnlyList<RawPointerPoint>?>? previousPoints) Lazy<IReadOnlyList<RawPointerPoint>?>? previousPoints)
#pragma warning disable CS0618
: this(routedEvent, source, pointer, rootVisual, rootVisualPosition, timestamp, properties, modifiers) : this(routedEvent, source, pointer, rootVisual, rootVisualPosition, timestamp, properties, modifiers)
#pragma warning restore CS0618
{ {
_previousPoints = previousPoints; _previousPoints = previousPoints;
} }
@ -160,9 +158,8 @@ namespace Avalonia.Input
public class PointerPressedEventArgs : PointerEventArgs public class PointerPressedEventArgs : PointerEventArgs
{ {
[Unstable("This constructor might be removed in 12.0. For unit testing, consider using IHeadlessWindow mouse methods.")]
public PointerPressedEventArgs( public PointerPressedEventArgs(
object source, object? source,
IPointer pointer, IPointer pointer,
Visual rootVisual, Point rootVisualPosition, Visual rootVisual, Point rootVisualPosition,
ulong timestamp, ulong timestamp,
@ -180,9 +177,8 @@ namespace Avalonia.Input
public class PointerReleasedEventArgs : PointerEventArgs public class PointerReleasedEventArgs : PointerEventArgs
{ {
[Unstable("This constructor might be removed in 12.0. For unit testing, consider using IHeadlessWindow mouse methods.")]
public PointerReleasedEventArgs( public PointerReleasedEventArgs(
object source, IPointer pointer, object? source, IPointer pointer,
Visual rootVisual, Point rootVisualPosition, ulong timestamp, Visual rootVisual, Point rootVisualPosition, ulong timestamp,
PointerPointProperties properties, KeyModifiers modifiers, PointerPointProperties properties, KeyModifiers modifiers,
MouseButton initialPressMouseButton) MouseButton initialPressMouseButton)
@ -202,8 +198,7 @@ namespace Avalonia.Input
{ {
public IPointer Pointer { get; } public IPointer Pointer { get; }
[Unstable("This constructor might be removed in 12.0. If you need to remove capture, use stable methods on the IPointer instance.")] public PointerCaptureLostEventArgs(object? source, IPointer pointer) : base(InputElement.PointerCaptureLostEvent)
public PointerCaptureLostEventArgs(object source, IPointer pointer) : base(InputElement.PointerCaptureLostEvent)
{ {
Pointer = pointer; Pointer = pointer;
Source = source; Source = source;
@ -216,7 +211,7 @@ namespace Avalonia.Input
public CaptureSource CaptureSource { get; } public CaptureSource CaptureSource { get; }
public IInputElement? NewValue { get; } public IInputElement? NewValue { get; }
internal PointerCaptureChangingEventArgs(object source, IPointer pointer, IInputElement? newValue, CaptureSource captureSource) : base(InputElement.PointerCaptureChangingEvent) internal PointerCaptureChangingEventArgs(object? source, IPointer pointer, IInputElement? newValue, CaptureSource captureSource) : base(InputElement.PointerCaptureChangingEvent)
{ {
Pointer = pointer; Pointer = pointer;
Source = source; Source = source;

8
src/Avalonia.Base/Input/PointerWheelEventArgs.cs

@ -1,16 +1,10 @@
using System;
using Avalonia.Interactivity;
using Avalonia.Metadata;
using Avalonia.VisualTree;
namespace Avalonia.Input namespace Avalonia.Input
{ {
public class PointerWheelEventArgs : PointerEventArgs public class PointerWheelEventArgs : PointerEventArgs
{ {
public Vector Delta { get; } public Vector Delta { get; }
[Unstable("This constructor might be removed in 12.0. For unit testing, consider using IHeadlessWindow.MouseWheel.")] public PointerWheelEventArgs(object? source, IPointer pointer, Visual rootVisual,
public PointerWheelEventArgs(object source, IPointer pointer, Visual rootVisual,
Point rootVisualPosition, ulong timestamp, Point rootVisualPosition, ulong timestamp,
PointerPointProperties properties, KeyModifiers modifiers, Vector delta) PointerPointProperties properties, KeyModifiers modifiers, Vector delta)
: base(InputElement.PointerWheelChangedEvent, source, pointer, rootVisual, rootVisualPosition, : base(InputElement.PointerWheelChangedEvent, source, pointer, rootVisual, rootVisualPosition,

Loading…
Cancel
Save