Browse Source

Merge pull request #8147 from wieslawsoltes/fixes/AddMissingRoutedEventsProperties

Routing event fixes
pull/8156/head
Max Katz 4 years ago
committed by GitHub
parent
commit
167065fd06
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 18
      src/Avalonia.Base/Input/InputElement.cs
  2. 2
      src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
  3. 2
      src/Avalonia.Controls/Primitives/TemplatedControl.cs
  4. 6
      src/Avalonia.Controls/TextBox.cs
  5. 4
      src/Avalonia.Controls/Window.cs

18
src/Avalonia.Base/Input/InputElement.cs

@ -94,7 +94,7 @@ namespace Avalonia.Input
/// </summary> /// </summary>
public static readonly RoutedEvent<KeyEventArgs> KeyDownEvent = public static readonly RoutedEvent<KeyEventArgs> KeyDownEvent =
RoutedEvent.Register<InputElement, KeyEventArgs>( RoutedEvent.Register<InputElement, KeyEventArgs>(
"KeyDown", nameof(KeyDown),
RoutingStrategies.Tunnel | RoutingStrategies.Bubble); RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
/// <summary> /// <summary>
@ -102,7 +102,7 @@ namespace Avalonia.Input
/// </summary> /// </summary>
public static readonly RoutedEvent<KeyEventArgs> KeyUpEvent = public static readonly RoutedEvent<KeyEventArgs> KeyUpEvent =
RoutedEvent.Register<InputElement, KeyEventArgs>( RoutedEvent.Register<InputElement, KeyEventArgs>(
"KeyUp", nameof(KeyUp),
RoutingStrategies.Tunnel | RoutingStrategies.Bubble); RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
/// <summary> /// <summary>
@ -116,7 +116,7 @@ namespace Avalonia.Input
/// </summary> /// </summary>
public static readonly RoutedEvent<TextInputEventArgs> TextInputEvent = public static readonly RoutedEvent<TextInputEventArgs> TextInputEvent =
RoutedEvent.Register<InputElement, TextInputEventArgs>( RoutedEvent.Register<InputElement, TextInputEventArgs>(
"TextInput", nameof(TextInput),
RoutingStrategies.Tunnel | RoutingStrategies.Bubble); RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
/// <summary> /// <summary>
@ -124,7 +124,7 @@ namespace Avalonia.Input
/// </summary> /// </summary>
public static readonly RoutedEvent<TextInputMethodClientRequestedEventArgs> TextInputMethodClientRequestedEvent = public static readonly RoutedEvent<TextInputMethodClientRequestedEventArgs> TextInputMethodClientRequestedEvent =
RoutedEvent.Register<InputElement, TextInputMethodClientRequestedEventArgs>( RoutedEvent.Register<InputElement, TextInputMethodClientRequestedEventArgs>(
"TextInputMethodClientRequested", nameof(TextInputMethodClientRequested),
RoutingStrategies.Tunnel | RoutingStrategies.Bubble); RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
/// <summary> /// <summary>
@ -144,7 +144,7 @@ namespace Avalonia.Input
/// </summary> /// </summary>
public static readonly RoutedEvent<PointerEventArgs> PointerMovedEvent = public static readonly RoutedEvent<PointerEventArgs> PointerMovedEvent =
RoutedEvent.Register<InputElement, PointerEventArgs>( RoutedEvent.Register<InputElement, PointerEventArgs>(
"PointerMoved", nameof(PointerMoved),
RoutingStrategies.Tunnel | RoutingStrategies.Bubble); RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
/// <summary> /// <summary>
@ -152,7 +152,7 @@ namespace Avalonia.Input
/// </summary> /// </summary>
public static readonly RoutedEvent<PointerPressedEventArgs> PointerPressedEvent = public static readonly RoutedEvent<PointerPressedEventArgs> PointerPressedEvent =
RoutedEvent.Register<InputElement, PointerPressedEventArgs>( RoutedEvent.Register<InputElement, PointerPressedEventArgs>(
"PointerPressed", nameof(PointerPressed),
RoutingStrategies.Tunnel | RoutingStrategies.Bubble); RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
/// <summary> /// <summary>
@ -160,7 +160,7 @@ namespace Avalonia.Input
/// </summary> /// </summary>
public static readonly RoutedEvent<PointerReleasedEventArgs> PointerReleasedEvent = public static readonly RoutedEvent<PointerReleasedEventArgs> PointerReleasedEvent =
RoutedEvent.Register<InputElement, PointerReleasedEventArgs>( RoutedEvent.Register<InputElement, PointerReleasedEventArgs>(
"PointerReleased", nameof(PointerReleased),
RoutingStrategies.Tunnel | RoutingStrategies.Bubble); RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
/// <summary> /// <summary>
@ -168,7 +168,7 @@ namespace Avalonia.Input
/// </summary> /// </summary>
public static readonly RoutedEvent<PointerCaptureLostEventArgs> PointerCaptureLostEvent = public static readonly RoutedEvent<PointerCaptureLostEventArgs> PointerCaptureLostEvent =
RoutedEvent.Register<InputElement, PointerCaptureLostEventArgs>( RoutedEvent.Register<InputElement, PointerCaptureLostEventArgs>(
"PointerCaptureLost", nameof(PointerCaptureLost),
RoutingStrategies.Direct); RoutingStrategies.Direct);
/// <summary> /// <summary>
@ -176,7 +176,7 @@ namespace Avalonia.Input
/// </summary> /// </summary>
public static readonly RoutedEvent<PointerWheelEventArgs> PointerWheelChangedEvent = public static readonly RoutedEvent<PointerWheelEventArgs> PointerWheelChangedEvent =
RoutedEvent.Register<InputElement, PointerWheelEventArgs>( RoutedEvent.Register<InputElement, PointerWheelEventArgs>(
"PointerWheelChanged", nameof(PointerWheelChanged),
RoutingStrategies.Tunnel | RoutingStrategies.Bubble); RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
/// <summary> /// <summary>

2
src/Avalonia.Controls/Primitives/SelectingItemsControl.cs

@ -111,7 +111,7 @@ namespace Avalonia.Controls.Primitives
/// </summary> /// </summary>
public static readonly RoutedEvent<SelectionChangedEventArgs> SelectionChangedEvent = public static readonly RoutedEvent<SelectionChangedEventArgs> SelectionChangedEvent =
RoutedEvent.Register<SelectingItemsControl, SelectionChangedEventArgs>( RoutedEvent.Register<SelectingItemsControl, SelectionChangedEventArgs>(
"SelectionChanged", nameof(SelectionChanged),
RoutingStrategies.Bubble); RoutingStrategies.Bubble);
/// <summary> /// <summary>

2
src/Avalonia.Controls/Primitives/TemplatedControl.cs

@ -97,7 +97,7 @@ namespace Avalonia.Controls.Primitives
/// </summary> /// </summary>
public static readonly RoutedEvent<TemplateAppliedEventArgs> TemplateAppliedEvent = public static readonly RoutedEvent<TemplateAppliedEventArgs> TemplateAppliedEvent =
RoutedEvent.Register<TemplatedControl, TemplateAppliedEventArgs>( RoutedEvent.Register<TemplatedControl, TemplateAppliedEventArgs>(
"TemplateApplied", nameof(TemplateApplied),
RoutingStrategies.Direct); RoutingStrategies.Direct);
private IControlTemplate? _appliedTemplate; private IControlTemplate? _appliedTemplate;

6
src/Avalonia.Controls/TextBox.cs

@ -160,15 +160,15 @@ namespace Avalonia.Controls
public static readonly RoutedEvent<RoutedEventArgs> CopyingToClipboardEvent = public static readonly RoutedEvent<RoutedEventArgs> CopyingToClipboardEvent =
RoutedEvent.Register<TextBox, RoutedEventArgs>( RoutedEvent.Register<TextBox, RoutedEventArgs>(
"CopyingToClipboard", RoutingStrategies.Bubble); nameof(CopyingToClipboard), RoutingStrategies.Bubble);
public static readonly RoutedEvent<RoutedEventArgs> CuttingToClipboardEvent = public static readonly RoutedEvent<RoutedEventArgs> CuttingToClipboardEvent =
RoutedEvent.Register<TextBox, RoutedEventArgs>( RoutedEvent.Register<TextBox, RoutedEventArgs>(
"CuttingToClipboard", RoutingStrategies.Bubble); nameof(CuttingToClipboard), RoutingStrategies.Bubble);
public static readonly RoutedEvent<RoutedEventArgs> PastingFromClipboardEvent = public static readonly RoutedEvent<RoutedEventArgs> PastingFromClipboardEvent =
RoutedEvent.Register<TextBox, RoutedEventArgs>( RoutedEvent.Register<TextBox, RoutedEventArgs>(
"PastingFromClipboard", RoutingStrategies.Bubble); nameof(PastingFromClipboard), RoutingStrategies.Bubble);
readonly struct UndoRedoState : IEquatable<UndoRedoState> readonly struct UndoRedoState : IEquatable<UndoRedoState>
{ {

4
src/Avalonia.Controls/Window.cs

@ -171,13 +171,13 @@ namespace Avalonia.Controls
/// <summary> /// <summary>
/// Routed event that can be used for global tracking of window destruction /// Routed event that can be used for global tracking of window destruction
/// </summary> /// </summary>
public static readonly RoutedEvent WindowClosedEvent = public static readonly RoutedEvent<RoutedEventArgs> WindowClosedEvent =
RoutedEvent.Register<Window, RoutedEventArgs>("WindowClosed", RoutingStrategies.Direct); RoutedEvent.Register<Window, RoutedEventArgs>("WindowClosed", RoutingStrategies.Direct);
/// <summary> /// <summary>
/// Routed event that can be used for global tracking of opening windows /// Routed event that can be used for global tracking of opening windows
/// </summary> /// </summary>
public static readonly RoutedEvent WindowOpenedEvent = public static readonly RoutedEvent<RoutedEventArgs> WindowOpenedEvent =
RoutedEvent.Register<Window, RoutedEventArgs>("WindowOpened", RoutingStrategies.Direct); RoutedEvent.Register<Window, RoutedEventArgs>("WindowOpened", RoutingStrategies.Direct);

Loading…
Cancel
Save