Skip to content

[Android] Fix hover events recording gestures other than HoverGestureHandler #4220

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

Open
j-piasecki wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −2
Open

[Android] Fix hover events recording gestures other than HoverGestureHandler #4220

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions ...ler/android/src/main/java/com/swmansion/gesturehandler/core/GestureHandlerOrchestrator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ class GestureHandlerOrchestrator(
top + view.height > parent.height
}

private fun extractAncestorHandlers(view: View, coords: FloatArray, pointerId: Int): Boolean {
private fun extractAncestorHandlers(view: View, coords: FloatArray, pointerId: Int, event: MotionEvent): Boolean {
var found = false
var parent = view.parent

Expand All @@ -509,6 +509,10 @@ class GestureHandlerOrchestrator(
handlerRegistry.getHandlersForView(parent)?.let {
synchronized(it) {
for (handler in it) {
if (shouldHandlerSkipHoverEvents(handler, event)) {
continue
}

if (handler.isEnabled && handler.isWithinBounds(view, coords[0], coords[1])) {
found = true
recordHandlerIfNotPresent(handler, parentViewGroup)
Expand Down Expand Up @@ -568,7 +572,7 @@ class GestureHandlerOrchestrator(
if (coords[0] in 0f..view.width.toFloat() &&
coords[1] in 0f..view.height.toFloat() &&
isViewOverflowingParent(view) &&
extractAncestorHandlers(view, coords, pointerId)
extractAncestorHandlers(view, coords, pointerId, event)
) {
found = true
}
Expand Down
Loading