diff --git a/src/Avalonia.Base/Input/IInputElement.cs b/src/Avalonia.Base/Input/IInputElement.cs
index c6efb851ef..43ac87d008 100644
--- a/src/Avalonia.Base/Input/IInputElement.cs
+++ b/src/Avalonia.Base/Input/IInputElement.cs
@@ -47,7 +47,7 @@ namespace Avalonia.Input
///
/// Occurs when the pointer leaves the control.
///
- event EventHandler? PointerLeave;
+ event EventHandler? PointerExited;
///
/// Occurs when the pointer is pressed over the control.
diff --git a/src/Avalonia.Base/Input/InputElement.cs b/src/Avalonia.Base/Input/InputElement.cs
index 4affc5e592..d0130258c3 100644
--- a/src/Avalonia.Base/Input/InputElement.cs
+++ b/src/Avalonia.Base/Input/InputElement.cs
@@ -136,11 +136,11 @@ namespace Avalonia.Input
RoutingStrategies.Direct);
///
- /// Defines the event.
+ /// Defines the event.
///
- public static readonly RoutedEvent PointerLeaveEvent =
+ public static readonly RoutedEvent PointerExitedEvent =
RoutedEvent.Register(
- nameof(PointerLeave),
+ nameof(PointerExited),
RoutingStrategies.Direct);
///
@@ -212,8 +212,8 @@ namespace Avalonia.Input
KeyDownEvent.AddClassHandler((x, e) => x.OnKeyDown(e));
KeyUpEvent.AddClassHandler((x, e) => x.OnKeyUp(e));
TextInputEvent.AddClassHandler((x, e) => x.OnTextInput(e));
- PointerEnteredEvent.AddClassHandler((x, e) => x.OnPointerEnterCore(e));
- PointerLeaveEvent.AddClassHandler((x, e) => x.OnPointerLeaveCore(e));
+ PointerEnteredEvent.AddClassHandler((x, e) => x.OnPointerEnteredCore(e));
+ PointerExitedEvent.AddClassHandler((x, e) => x.OnPointerExitedCore(e));
PointerMovedEvent.AddClassHandler((x, e) => x.OnPointerMoved(e));
PointerPressedEvent.AddClassHandler((x, e) => x.OnPointerPressed(e));
PointerReleasedEvent.AddClassHandler((x, e) => x.OnPointerReleased(e));
@@ -292,10 +292,10 @@ namespace Avalonia.Input
///
/// Occurs when the pointer leaves the control.
///
- public event EventHandler? PointerLeave
+ public event EventHandler? PointerExited
{
- add { AddHandler(PointerLeaveEvent, value); }
- remove { RemoveHandler(PointerLeaveEvent, value); }
+ add { AddHandler(PointerExitedEvent, value); }
+ remove { RemoveHandler(PointerExitedEvent, value); }
}
///
@@ -551,10 +551,10 @@ namespace Avalonia.Input
}
///
- /// Called before the event occurs.
+ /// Called before the event occurs.
///
/// The event args.
- protected virtual void OnPointerLeave(PointerEventArgs e)
+ protected virtual void OnPointerExited(PointerEventArgs e)
{
}
@@ -647,20 +647,20 @@ namespace Avalonia.Input
/// Called before the event occurs.
///
/// The event args.
- private void OnPointerEnterCore(PointerEventArgs e)
+ private void OnPointerEnteredCore(PointerEventArgs e)
{
IsPointerOver = true;
OnPointerEntered(e);
}
///
- /// Called before the event occurs.
+ /// Called before the event occurs.
///
/// The event args.
- private void OnPointerLeaveCore(PointerEventArgs e)
+ private void OnPointerExitedCore(PointerEventArgs e)
{
IsPointerOver = false;
- OnPointerLeave(e);
+ OnPointerExited(e);
}
///
diff --git a/src/Avalonia.Base/Input/PointerOverPreProcessor.cs b/src/Avalonia.Base/Input/PointerOverPreProcessor.cs
index a62c974881..67d1eea7e3 100644
--- a/src/Avalonia.Base/Input/PointerOverPreProcessor.cs
+++ b/src/Avalonia.Base/Input/PointerOverPreProcessor.cs
@@ -97,7 +97,7 @@ namespace Avalonia.Input
// Do not pass rootVisual, when we have unknown (negative) position,
// so GetPosition won't return invalid values.
var hasPosition = position.X >= 0 && position.Y >= 0;
- var e = new PointerEventArgs(InputElement.PointerLeaveEvent, element, pointer,
+ var e = new PointerEventArgs(InputElement.PointerExitedEvent, element, pointer,
hasPosition ? root : null, hasPosition ? position : default,
timestamp, properties, inputModifiers);
@@ -177,7 +177,7 @@ namespace Avalonia.Input
el = root.PointerOverElement;
- var e = new PointerEventArgs(InputElement.PointerLeaveEvent, el, pointer, root, position,
+ var e = new PointerEventArgs(InputElement.PointerExitedEvent, el, pointer, root, position,
timestamp, properties, inputModifiers);
if (el != null && branch != null && !el.IsAttachedToVisualTree)
{
diff --git a/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.cs b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.cs
index d681834c69..7e6b70a146 100644
--- a/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.cs
+++ b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.cs
@@ -129,7 +129,7 @@ namespace Avalonia.Controls.Primitives
if (_inputTarget != null)
{
_inputTarget.PointerEntered += InputTarget_PointerEntered;
- _inputTarget.PointerLeave += InputTarget_PointerLeave;
+ _inputTarget.PointerExited += InputTarget_PointerExited;
_inputTarget.PointerPressed += InputTarget_PointerPressed;
_inputTarget.PointerMoved += InputTarget_PointerMoved;
_inputTarget.PointerReleased += InputTarget_PointerReleased;
@@ -195,7 +195,7 @@ namespace Avalonia.Controls.Primitives
if (_inputTarget != null)
{
_inputTarget.PointerEntered -= InputTarget_PointerEntered;
- _inputTarget.PointerLeave -= InputTarget_PointerLeave;
+ _inputTarget.PointerExited -= InputTarget_PointerExited;
_inputTarget.PointerPressed -= InputTarget_PointerPressed;
_inputTarget.PointerMoved -= InputTarget_PointerMoved;
_inputTarget.PointerReleased -= InputTarget_PointerReleased;
@@ -362,7 +362,7 @@ namespace Avalonia.Controls.Primitives
}
///
- protected override void OnPointerLeave(PointerEventArgs e)
+ protected override void OnPointerExited(PointerEventArgs e)
{
// We only want to bother with the color name tool tip if we can provide color names.
if (_selectionEllipsePanel != null &&
@@ -373,7 +373,7 @@ namespace Avalonia.Controls.Primitives
UpdatePseudoClasses();
- base.OnPointerLeave(e);
+ base.OnPointerExited(e);
}
///
@@ -856,8 +856,8 @@ namespace Avalonia.Controls.Primitives
args.Handled = true;
}
- ///
- private void InputTarget_PointerLeave(object? sender, PointerEventArgs args)
+ ///
+ private void InputTarget_PointerExited(object? sender, PointerEventArgs args)
{
_isPointerOver = false;
UpdatePseudoClasses();
diff --git a/src/Avalonia.Controls.DataGrid/DataGridCell.cs b/src/Avalonia.Controls.DataGrid/DataGridCell.cs
index 9358c348ce..2a51f45896 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridCell.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridCell.cs
@@ -148,9 +148,9 @@ namespace Avalonia.Controls
IsMouseOver = true;
}
}
- protected override void OnPointerLeave(PointerEventArgs e)
+ protected override void OnPointerExited(PointerEventArgs e)
{
- base.OnPointerLeave(e);
+ base.OnPointerExited(e);
if (OwningRow != null)
{
diff --git a/src/Avalonia.Controls.DataGrid/DataGridColumnHeader.cs b/src/Avalonia.Controls.DataGrid/DataGridColumnHeader.cs
index 897996d8d3..d3bd968d62 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridColumnHeader.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridColumnHeader.cs
@@ -85,7 +85,7 @@ namespace Avalonia.Controls
PointerReleased += DataGridColumnHeader_PointerReleased;
PointerMoved += DataGridColumnHeader_PointerMoved;
PointerEntered += DataGridColumnHeader_PointerEntered;
- PointerLeave += DataGridColumnHeader_PointerLeave;
+ PointerExited += DataGridColumnHeader_PointerExited;
}
private void OnAreSeparatorsVisibleChanged(AvaloniaPropertyChangedEventArgs e)
@@ -464,7 +464,7 @@ namespace Avalonia.Controls
UpdatePseudoClasses();
}
- private void DataGridColumnHeader_PointerLeave(object sender, PointerEventArgs e)
+ private void DataGridColumnHeader_PointerExited(object sender, PointerEventArgs e)
{
if (!IsEnabled)
{
diff --git a/src/Avalonia.Controls.DataGrid/DataGridRow.cs b/src/Avalonia.Controls.DataGrid/DataGridRow.cs
index 02c57965fd..1559763a1b 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridRow.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridRow.cs
@@ -612,10 +612,10 @@ namespace Avalonia.Controls
base.OnPointerEntered(e);
IsMouseOver = true;
}
- protected override void OnPointerLeave(PointerEventArgs e)
+ protected override void OnPointerExited(PointerEventArgs e)
{
IsMouseOver = false;
- base.OnPointerLeave(e);
+ base.OnPointerExited(e);
}
internal void ApplyCellsState()
diff --git a/src/Avalonia.Controls.DataGrid/DataGridRowGroupHeader.cs b/src/Avalonia.Controls.DataGrid/DataGridRowGroupHeader.cs
index 74ee872e72..9f37e8a6aa 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridRowGroupHeader.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridRowGroupHeader.cs
@@ -386,7 +386,7 @@ namespace Avalonia.Controls
base.OnPointerEntered(e);
}
- protected override void OnPointerLeave(PointerEventArgs e)
+ protected override void OnPointerExited(PointerEventArgs e)
{
if (IsEnabled)
{
@@ -394,7 +394,7 @@ namespace Avalonia.Controls
UpdatePseudoClasses();
}
- base.OnPointerLeave(e);
+ base.OnPointerExited(e);
}
private void SetIsCheckedNoCallBack(bool value)
diff --git a/src/Avalonia.Controls.DataGrid/DataGridRowHeader.cs b/src/Avalonia.Controls.DataGrid/DataGridRowHeader.cs
index d8775061de..fe3ba0abf6 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridRowHeader.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridRowHeader.cs
@@ -167,14 +167,14 @@ namespace Avalonia.Controls.Primitives
base.OnPointerEntered(e);
}
- protected override void OnPointerLeave(PointerEventArgs e)
+ protected override void OnPointerExited(PointerEventArgs e)
{
if (OwningRow != null)
{
OwningRow.IsMouseOver = false;
}
- base.OnPointerLeave(e);
+ base.OnPointerExited(e);
}
//TODO TabStop
diff --git a/src/Avalonia.Controls/MenuItem.cs b/src/Avalonia.Controls/MenuItem.cs
index 106b0b27a5..11c42f2ef3 100644
--- a/src/Avalonia.Controls/MenuItem.cs
+++ b/src/Avalonia.Controls/MenuItem.cs
@@ -79,25 +79,33 @@ namespace Avalonia.Controls
/// Defines the event.
///
public static readonly RoutedEvent ClickEvent =
- RoutedEvent.Register