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

Jump to bottom

[Windows] Subscribe less pointer events in UpdatingGestureRecognizers #22781

Merged
merged 2 commits into from
Jun 5, 2024
Merged

[Windows] Subscribe less pointer events in UpdatingGestureRecognizers #22781

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77b4bde
Refactoring: Use code blocks instead of lambdas
MartyIX Jun 1, 2024
56a1eaa
Subscribe PointerPressed, PointerExited, and PointerReleased events j…
MartyIX Jun 1, 2024
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
45 changes: 30 additions & 15 deletions src/Controls/src/Core/Platform/GestureManager/GesturePlatformManager.Windows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,9 +361,6 @@ void ClearContainerEventHandlers()
_container.ManipulationDelta -= OnManipulationDelta;
_container.ManipulationStarted -= OnManipulationStarted;
_container.ManipulationCompleted -= OnManipulationCompleted;
_container.PointerPressed -= OnPointerPressed;
_container.PointerExited -= OnPointerExited;
_container.PointerReleased -= OnPointerReleased;
_container.PointerCanceled -= OnPointerCanceled;
}
}
Expand Down Expand Up @@ -540,24 +537,45 @@ void OnPgrPointerEntered(object sender, PointerRoutedEventArgs e)
=> GetPosition(relativeTo, e), _control is null ? null : new PlatformPointerEventArgs(_control, e)));

void OnPgrPointerExited(object sender, PointerRoutedEventArgs e)
=> HandlePgrPointerEvent(e, (view, recognizer)
=> recognizer.SendPointerExited(view, (relativeTo)
=> GetPosition(relativeTo, e), _control is null ? null : new PlatformPointerEventArgs(_control, e)));
{
HandlePgrPointerEvent(e, (view, recognizer)
=> recognizer.SendPointerExited(view, (relativeTo)
=> GetPosition(relativeTo, e), _control is null ? null : new PlatformPointerEventArgs(_control, e)));

if ((_subscriptionFlags & SubscriptionFlags.ContainerManipulationAndPointerEventsSubscribed) != 0)
{
OnPointerExited(sender, e);
}
}

void OnPgrPointerMoved(object sender, PointerRoutedEventArgs e)
=> HandlePgrPointerEvent(e, (view, recognizer)
=> recognizer.SendPointerMoved(view, (relativeTo)
=> GetPosition(relativeTo, e), _control is null ? null : new PlatformPointerEventArgs(_control, e)));

void OnPgrPointerPressed(object sender, PointerRoutedEventArgs e)
=> HandlePgrPointerEvent(e, (view, recognizer)
=> recognizer.SendPointerPressed(view, (relativeTo)
=> GetPosition(relativeTo, e), _control is null ? null : new PlatformPointerEventArgs(_control, e)));
{
HandlePgrPointerEvent(e, (view, recognizer)
=> recognizer.SendPointerPressed(view, (relativeTo)
=> GetPosition(relativeTo, e), _control is null ? null : new PlatformPointerEventArgs(_control, e)));

if ((_subscriptionFlags & SubscriptionFlags.ContainerManipulationAndPointerEventsSubscribed) != 0)
{
OnPointerPressed(sender, e);
}
}

void OnPgrPointerReleased(object sender, PointerRoutedEventArgs e)
=> HandlePgrPointerEvent(e, (view, recognizer)
=> recognizer.SendPointerReleased(view, (relativeTo)
=> GetPosition(relativeTo, e), _control is null ? null : new PlatformPointerEventArgs(_control, e)));
{
HandlePgrPointerEvent(e, (view, recognizer)
=> recognizer.SendPointerReleased(view, (relativeTo)
=> GetPosition(relativeTo, e), _control is null ? null : new PlatformPointerEventArgs(_control, e)));

if ((_subscriptionFlags & SubscriptionFlags.ContainerManipulationAndPointerEventsSubscribed) != 0)
{
OnPointerReleased(sender, e);
}
}

private void HandlePgrPointerEvent(PointerRoutedEventArgs e, Action<View, PointerGestureRecognizer> SendPointerEvent)
{
Expand Down Expand Up @@ -821,9 +839,6 @@ void UpdatingGestureRecognizers()
_container.ManipulationDelta += OnManipulationDelta;
_container.ManipulationStarted += OnManipulationStarted;
_container.ManipulationCompleted += OnManipulationCompleted;
_container.PointerPressed += OnPointerPressed;
_container.PointerExited += OnPointerExited;
_container.PointerReleased += OnPointerReleased;
_container.PointerCanceled += OnPointerCanceled;
}

Expand Down
Loading