Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename to PointerEntered and PointerExited #8396

Merged
merged 3 commits into from
Jun 27, 2022
Merged

Rename to PointerEntered and PointerExited #8396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a0903f
Rename PointerEnter to PointerEntered
robloo Jun 26, 2022
0863a05
Rename PointerLeave to PointerExited
robloo Jun 26, 2022
9babd79
Merge branch 'master' into rename-entered-exited-events
maxkatz6 Jun 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Avalonia.Base/Input/IInputElement.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ public interface IInputElement : IInteractive, IVisual
/// <summary>
/// Occurs when the pointer enters the control.
/// </summary>
event EventHandler<PointerEventArgs>? PointerEnter;
event EventHandler<PointerEventArgs>? PointerEntered;

/// <summary>
/// Occurs when the pointer leaves the control.
/// </summary>
event EventHandler<PointerEventArgs>? PointerLeave;
event EventHandler<PointerEventArgs>? PointerExited;

/// <summary>
/// Occurs when the pointer is pressed over the control.
Expand Down
58 changes: 34 additions & 24 deletions src/Avalonia.Base/Input/InputElement.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,16 +128,20 @@ public class InputElement : Interactive, IInputElement
RoutingStrategies.Tunnel | RoutingStrategies.Bubble);

/// <summary>
/// Defines the <see cref="PointerEnter"/> event.
/// Defines the <see cref="PointerEntered"/> event.
/// </summary>
public static readonly RoutedEvent<PointerEventArgs> PointerEnterEvent =
RoutedEvent.Register<InputElement, PointerEventArgs>(nameof(PointerEnter), RoutingStrategies.Direct);
public static readonly RoutedEvent<PointerEventArgs> PointerEnteredEvent =
RoutedEvent.Register<InputElement, PointerEventArgs>(
nameof(PointerEntered),
RoutingStrategies.Direct);

/// <summary>
/// Defines the <see cref="PointerLeave"/> event.
/// Defines the <see cref="PointerExited"/> event.
/// </summary>
public static readonly RoutedEvent<PointerEventArgs> PointerLeaveEvent =
RoutedEvent.Register<InputElement, PointerEventArgs>(nameof(PointerLeave), RoutingStrategies.Direct);
public static readonly RoutedEvent<PointerEventArgs> PointerExitedEvent =
RoutedEvent.Register<InputElement, PointerEventArgs>(
nameof(PointerExited),
RoutingStrategies.Direct);

/// <summary>
/// Defines the <see cref="PointerMoved"/> event.
Expand Down Expand Up @@ -208,8 +212,8 @@ static InputElement()
KeyDownEvent.AddClassHandler<InputElement>((x, e) => x.OnKeyDown(e));
KeyUpEvent.AddClassHandler<InputElement>((x, e) => x.OnKeyUp(e));
TextInputEvent.AddClassHandler<InputElement>((x, e) => x.OnTextInput(e));
PointerEnterEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerEnterCore(e));
PointerLeaveEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerLeaveCore(e));
PointerEnteredEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerEnteredCore(e));
PointerExitedEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerExitedCore(e));
PointerMovedEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerMoved(e));
PointerPressedEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerPressed(e));
PointerReleasedEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerReleased(e));
Expand Down Expand Up @@ -279,19 +283,19 @@ public event EventHandler<TextInputMethodClientRequestedEventArgs>? TextInputMet
/// <summary>
/// Occurs when the pointer enters the control.
/// </summary>
public event EventHandler<PointerEventArgs>? PointerEnter
public event EventHandler<PointerEventArgs>? PointerEntered
{
add { AddHandler(PointerEnterEvent, value); }
remove { RemoveHandler(PointerEnterEvent, value); }
add { AddHandler(PointerEnteredEvent, value); }
remove { RemoveHandler(PointerEnteredEvent, value); }
}

/// <summary>
/// Occurs when the pointer leaves the control.
/// </summary>
public event EventHandler<PointerEventArgs>? PointerLeave
public event EventHandler<PointerEventArgs>? PointerExited
{
add { AddHandler(PointerLeaveEvent, value); }
remove { RemoveHandler(PointerLeaveEvent, value); }
add { AddHandler(PointerExitedEvent, value); }
remove { RemoveHandler(PointerExitedEvent, value); }
}

/// <summary>
Expand Down Expand Up @@ -539,18 +543,18 @@ protected virtual void OnTextInput(TextInputEventArgs e)
}

/// <summary>
/// Called before the <see cref="PointerEnter"/> event occurs.
/// Called before the <see cref="PointerEntered"/> event occurs.
/// </summary>
/// <param name="e">The event args.</param>
protected virtual void OnPointerEnter(PointerEventArgs e)
protected virtual void OnPointerEntered(PointerEventArgs e)
{
}

/// <summary>
/// Called before the <see cref="PointerLeave"/> event occurs.
/// Called before the <see cref="PointerExited"/> event occurs.
/// </summary>
/// <param name="e">The event args.</param>
protected virtual void OnPointerLeave(PointerEventArgs e)
protected virtual void OnPointerExited(PointerEventArgs e)
{
}

Expand All @@ -561,7 +565,9 @@ protected virtual void OnPointerLeave(PointerEventArgs e)
protected virtual void OnPointerMoved(PointerEventArgs e)
{
if (_gestureRecognizers?.HandlePointerMoved(e) == true)
{
e.Handled = true;
}
}

/// <summary>
Expand All @@ -571,7 +577,9 @@ protected virtual void OnPointerMoved(PointerEventArgs e)
protected virtual void OnPointerPressed(PointerPressedEventArgs e)
{
if (_gestureRecognizers?.HandlePointerPressed(e) == true)
{
e.Handled = true;
}
}

/// <summary>
Expand All @@ -581,7 +589,9 @@ protected virtual void OnPointerPressed(PointerPressedEventArgs e)
protected virtual void OnPointerReleased(PointerReleasedEventArgs e)
{
if (_gestureRecognizers?.HandlePointerReleased(e) == true)
{
e.Handled = true;
}
}

/// <summary>
Expand Down Expand Up @@ -634,23 +644,23 @@ private static void IsEnabledChanged(AvaloniaPropertyChangedEventArgs e)
}

/// <summary>
/// Called before the <see cref="PointerEnter"/> event occurs.
/// Called before the <see cref="PointerEntered"/> event occurs.
/// </summary>
/// <param name="e">The event args.</param>
private void OnPointerEnterCore(PointerEventArgs e)
private void OnPointerEnteredCore(PointerEventArgs e)
{
IsPointerOver = true;
OnPointerEnter(e);
OnPointerEntered(e);
}

/// <summary>
/// Called before the <see cref="PointerLeave"/> event occurs.
/// Called before the <see cref="PointerExited"/> event occurs.
/// </summary>
/// <param name="e">The event args.</param>
private void OnPointerLeaveCore(PointerEventArgs e)
private void OnPointerExitedCore(PointerEventArgs e)
{
IsPointerOver = false;
OnPointerLeave(e);
OnPointerExited(e);
}

/// <summary>
Expand Down
6 changes: 3 additions & 3 deletions src/Avalonia.Base/Input/PointerOverPreProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ private void ClearPointerOver(IPointer pointer, IInputRoot root,
// 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);

Expand Down Expand Up @@ -177,7 +177,7 @@ private void SetPointerOverToElement(IPointer pointer, IInputRoot root, IInputEl

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)
{
Expand All @@ -195,7 +195,7 @@ private void SetPointerOverToElement(IPointer pointer, IInputRoot root, IInputEl
el = root.PointerOverElement = element;
_lastPointer = (pointer, root.PointToScreen(position));

e.RoutedEvent = InputElement.PointerEnterEvent;
e.RoutedEvent = InputElement.PointerEnteredEvent;

while (el != null && el != branch)
{
Expand Down
20 changes: 10 additions & 10 deletions src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)

if (_inputTarget != null)
{
_inputTarget.PointerEnter += InputTarget_PointerEnter;
_inputTarget.PointerLeave += InputTarget_PointerLeave;
_inputTarget.PointerEntered += InputTarget_PointerEntered;
_inputTarget.PointerExited += InputTarget_PointerExited;
_inputTarget.PointerPressed += InputTarget_PointerPressed;
_inputTarget.PointerMoved += InputTarget_PointerMoved;
_inputTarget.PointerReleased += InputTarget_PointerReleased;
Expand Down Expand Up @@ -194,8 +194,8 @@ private void UnregisterEvents()

if (_inputTarget != null)
{
_inputTarget.PointerEnter -= InputTarget_PointerEnter;
_inputTarget.PointerLeave -= InputTarget_PointerLeave;
_inputTarget.PointerEntered -= InputTarget_PointerEntered;
_inputTarget.PointerExited -= InputTarget_PointerExited;
_inputTarget.PointerPressed -= InputTarget_PointerPressed;
_inputTarget.PointerMoved -= InputTarget_PointerMoved;
_inputTarget.PointerReleased -= InputTarget_PointerReleased;
Expand Down Expand Up @@ -362,7 +362,7 @@ protected override void OnLostFocus(RoutedEventArgs e)
}

/// <inheritdoc/>
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 &&
Expand All @@ -373,7 +373,7 @@ protected override void OnPointerLeave(PointerEventArgs e)

UpdatePseudoClasses();

base.OnPointerLeave(e);
base.OnPointerExited(e);
}

/// <inheritdoc/>
Expand Down Expand Up @@ -848,16 +848,16 @@ private void UpdateEllipse()
UpdatePseudoClasses();
}

/// <inheritdoc cref="InputElement.PointerEnter"/>
private void InputTarget_PointerEnter(object? sender, PointerEventArgs args)
/// <inheritdoc cref="InputElement.PointerEntered"/>
private void InputTarget_PointerEntered(object? sender, PointerEventArgs args)
{
_isPointerOver = true;
UpdatePseudoClasses();
args.Handled = true;
}

/// <inheritdoc cref="InputElement.PointerLeave"/>
private void InputTarget_PointerLeave(object? sender, PointerEventArgs args)
/// <inheritdoc cref="InputElement.PointerExited"/>
private void InputTarget_PointerExited(object? sender, PointerEventArgs args)
{
_isPointerOver = false;
UpdatePseudoClasses();
Expand Down
8 changes: 4 additions & 4 deletions src/Avalonia.Controls.DataGrid/DataGridCell.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,18 +139,18 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
}

}
protected override void OnPointerEnter(PointerEventArgs e)
protected override void OnPointerEntered(PointerEventArgs e)
{
base.OnPointerEnter(e);
base.OnPointerEntered(e);

if (OwningRow != null)
{
IsMouseOver = true;
}
}
protected override void OnPointerLeave(PointerEventArgs e)
protected override void OnPointerExited(PointerEventArgs e)
{
base.OnPointerLeave(e);
base.OnPointerExited(e);

if (OwningRow != null)
{
Expand Down
12 changes: 6 additions & 6 deletions src/Avalonia.Controls.DataGrid/DataGridColumnHeader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ public DataGridColumnHeader()
{
PointerPressed += DataGridColumnHeader_PointerPressed;
PointerReleased += DataGridColumnHeader_PointerReleased;
PointerMoved += DataGridColumnHeader_PointerMove;
PointerEnter += DataGridColumnHeader_PointerEnter;
PointerLeave += DataGridColumnHeader_PointerLeave;
PointerMoved += DataGridColumnHeader_PointerMoved;
PointerEntered += DataGridColumnHeader_PointerEntered;
PointerExited += DataGridColumnHeader_PointerExited;
}

private void OnAreSeparatorsVisibleChanged(AvaloniaPropertyChangedEventArgs e)
Expand Down Expand Up @@ -452,7 +452,7 @@ internal void OnMouseMove(PointerEventArgs args, Point mousePosition, Point mous
SetDragCursor(mousePosition);
}

private void DataGridColumnHeader_PointerEnter(object sender, PointerEventArgs e)
private void DataGridColumnHeader_PointerEntered(object sender, PointerEventArgs e)
{
if (!IsEnabled)
{
Expand All @@ -464,7 +464,7 @@ private void DataGridColumnHeader_PointerEnter(object sender, PointerEventArgs e
UpdatePseudoClasses();
}

private void DataGridColumnHeader_PointerLeave(object sender, PointerEventArgs e)
private void DataGridColumnHeader_PointerExited(object sender, PointerEventArgs e)
{
if (!IsEnabled)
{
Expand Down Expand Up @@ -506,7 +506,7 @@ private void DataGridColumnHeader_PointerReleased(object sender, PointerReleased
UpdatePseudoClasses();
}

private void DataGridColumnHeader_PointerMove(object sender, PointerEventArgs e)
private void DataGridColumnHeader_PointerMoved(object sender, PointerEventArgs e)
{
if (OwningGrid == null || !IsEnabled)
{
Expand Down
8 changes: 4 additions & 4 deletions src/Avalonia.Controls.DataGrid/DataGridRow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,15 +607,15 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
}
}

protected override void OnPointerEnter(PointerEventArgs e)
protected override void OnPointerEntered(PointerEventArgs e)
{
base.OnPointerEnter(e);
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()
Expand Down
8 changes: 4 additions & 4 deletions src/Avalonia.Controls.DataGrid/DataGridRowGroupHeader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,26 +375,26 @@ internal void LoadVisualsForDisplay()
ApplyHeaderStatus();
}

protected override void OnPointerEnter(PointerEventArgs e)
protected override void OnPointerEntered(PointerEventArgs e)
{
if (IsEnabled)
{
IsMouseOver = true;
UpdatePseudoClasses();
}

base.OnPointerEnter(e);
base.OnPointerEntered(e);
}

protected override void OnPointerLeave(PointerEventArgs e)
protected override void OnPointerExited(PointerEventArgs e)
{
if (IsEnabled)
{
IsMouseOver = false;
UpdatePseudoClasses();
}

base.OnPointerLeave(e);
base.OnPointerExited(e);
}

private void SetIsCheckedNoCallBack(bool value)
Expand Down
8 changes: 4 additions & 4 deletions src/Avalonia.Controls.DataGrid/DataGridRowHeader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,23 +158,23 @@ internal void UpdatePseudoClasses()
}
}

protected override void OnPointerEnter(PointerEventArgs e)
protected override void OnPointerEntered(PointerEventArgs e)
{
if (OwningRow != null)
{
OwningRow.IsMouseOver = true;
}

base.OnPointerEnter(e);
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
Expand Down
Loading