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

fix: touch event absolute position #3078

Merged
merged 1 commit into from
Sep 2, 2024
Merged

fix: touch event absolute position #3078

Show file tree
Hide file tree
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
42 changes: 21 additions & 21 deletions android/src/main/java/com/swmansion/gesturehandler/core/GestureHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,19 +397,19 @@ open class GestureHandler<ConcreteGestureHandlerT : GestureHandler<ConcreteGestu
}
}

private fun dispatchTouchDownEvent(event: MotionEvent) {
private fun dispatchTouchDownEvent(event: MotionEvent, sourceEvent: MotionEvent) {
changedTouchesPayload = null
touchEventType = RNGestureHandlerTouchEvent.EVENT_TOUCH_DOWN
val pointerId = event.getPointerId(event.actionIndex)
val offsetX = event.rawX - event.x
val offsetY = event.rawY - event.y
val offsetX = sourceEvent.rawX - sourceEvent.x
val offsetY = sourceEvent.rawY - sourceEvent.y

trackedPointers[pointerId] = PointerData(
pointerId,
event.getX(event.actionIndex),
event.getY(event.actionIndex),
event.getX(event.actionIndex) + offsetX - windowOffset[0],
event.getY(event.actionIndex) + offsetY - windowOffset[1],
sourceEvent.getX(event.actionIndex) + offsetX - windowOffset[0],
sourceEvent.getY(event.actionIndex) + offsetY - windowOffset[1],
)
trackedPointersCount++
addChangedPointer(trackedPointers[pointerId]!!)
Expand All @@ -418,20 +418,20 @@ open class GestureHandler<ConcreteGestureHandlerT : GestureHandler<ConcreteGestu
dispatchTouchEvent()
}

private fun dispatchTouchUpEvent(event: MotionEvent) {
private fun dispatchTouchUpEvent(event: MotionEvent, sourceEvent: MotionEvent) {
extractAllPointersData()
changedTouchesPayload = null
touchEventType = RNGestureHandlerTouchEvent.EVENT_TOUCH_UP
val pointerId = event.getPointerId(event.actionIndex)
val offsetX = event.rawX - event.x
val offsetY = event.rawY - event.y
val offsetX = sourceEvent.rawX - sourceEvent.x
val offsetY = sourceEvent.rawY - sourceEvent.y

trackedPointers[pointerId] = PointerData(
pointerId,
event.getX(event.actionIndex),
event.getY(event.actionIndex),
event.getX(event.actionIndex) + offsetX - windowOffset[0],
event.getY(event.actionIndex) + offsetY - windowOffset[1],
sourceEvent.getX(event.actionIndex) + offsetX - windowOffset[0],
sourceEvent.getY(event.actionIndex) + offsetY - windowOffset[1],
)
addChangedPointer(trackedPointers[pointerId]!!)
trackedPointers[pointerId] = null
Expand All @@ -440,11 +440,11 @@ open class GestureHandler<ConcreteGestureHandlerT : GestureHandler<ConcreteGestu
dispatchTouchEvent()
}

private fun dispatchTouchMoveEvent(event: MotionEvent) {
private fun dispatchTouchMoveEvent(event: MotionEvent, sourceEvent: MotionEvent) {
changedTouchesPayload = null
touchEventType = RNGestureHandlerTouchEvent.EVENT_TOUCH_MOVE
val offsetX = event.rawX - event.x
val offsetY = event.rawY - event.y
val offsetX = sourceEvent.rawX - sourceEvent.x
val offsetY = sourceEvent.rawY - sourceEvent.y
var pointersAdded = 0

for (i in 0 until event.pointerCount) {
Expand All @@ -454,8 +454,8 @@ open class GestureHandler<ConcreteGestureHandlerT : GestureHandler<ConcreteGestu
if (pointer.x != event.getX(i) || pointer.y != event.getY(i)) {
pointer.x = event.getX(i)
pointer.y = event.getY(i)
pointer.absoluteX = event.getX(i) + offsetX - windowOffset[0]
pointer.absoluteY = event.getY(i) + offsetY - windowOffset[1]
pointer.absoluteX = sourceEvent.getX(i) + offsetX - windowOffset[0]
pointer.absoluteY = sourceEvent.getY(i) + offsetY - windowOffset[1]

addChangedPointer(pointer)
pointersAdded++
Expand All @@ -471,15 +471,15 @@ open class GestureHandler<ConcreteGestureHandlerT : GestureHandler<ConcreteGestu
}
}

fun updatePointerData(event: MotionEvent) {
fun updatePointerData(event: MotionEvent, sourceEvent: MotionEvent) {
if (event.actionMasked == MotionEvent.ACTION_DOWN || event.actionMasked == MotionEvent.ACTION_POINTER_DOWN) {
dispatchTouchDownEvent(event)
dispatchTouchMoveEvent(event)
dispatchTouchDownEvent(event, sourceEvent)
dispatchTouchMoveEvent(event, sourceEvent)
} else if (event.actionMasked == MotionEvent.ACTION_UP || event.actionMasked == MotionEvent.ACTION_POINTER_UP) {
dispatchTouchMoveEvent(event)
dispatchTouchUpEvent(event)
dispatchTouchMoveEvent(event, sourceEvent)
dispatchTouchUpEvent(event, sourceEvent)
} else if (event.actionMasked == MotionEvent.ACTION_MOVE) {
dispatchTouchMoveEvent(event)
dispatchTouchMoveEvent(event, sourceEvent)
}
}

Expand Down
4 changes: 2 additions & 2 deletions 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 @@ -270,7 +270,7 @@ class GestureHandlerOrchestrator(
// the first `onTouchesDown` event after the handler processes it and changes state
// to `BEGAN`.
if (handler.needsPointerData && handler.state != 0) {
handler.updatePointerData(event)
handler.updatePointerData(event, sourceEvent)
}

if (!handler.isAwaiting || action != MotionEvent.ACTION_MOVE) {
Expand All @@ -292,7 +292,7 @@ class GestureHandlerOrchestrator(
}

if (handler.needsPointerData && isFirstEvent) {
handler.updatePointerData(event)
handler.updatePointerData(event, sourceEvent)
}

// if event was of type UP or POINTER_UP we request handler to stop tracking now that
Expand Down
Loading