Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -203,19 +203,25 @@ open class GestureHandler {
}

fun startTrackingPointer(pointerId: Int) {
if (trackedPointerIDs[pointerId] == -1) {
trackedPointerIDs[pointerId] = findNextLocalPointerId()
trackedPointersIDsCount++
if (isTrackingPointer(pointerId)) {
return
}

trackedPointerIDs[pointerId] = findNextLocalPointerId()
trackedPointersIDsCount++
}

fun stopTrackingPointer(pointerId: Int) {
if (trackedPointerIDs[pointerId] != -1) {
trackedPointerIDs[pointerId] = -1
trackedPointersIDsCount--
if (!isTrackingPointer(pointerId)) {
return
}

trackedPointerIDs[pointerId] = -1
trackedPointersIDsCount--
}

private fun isTrackingPointer(pointerId: Int) = trackedPointerIDs[pointerId] != -1

private fun needAdapt(event: MotionEvent): Boolean {
if (event.pointerCount != trackedPointersIDsCount) {
return true
Expand Down Expand Up @@ -573,11 +579,11 @@ open class GestureHandler {
onStateChange(newState, oldState)
}

fun wantEvents(): Boolean = isEnabled &&
fun wantsEvent(event: MotionEvent): Boolean = isEnabled &&
state != STATE_FAILED &&
state != STATE_CANCELLED &&
state != STATE_END &&
trackedPointersIDsCount > 0
isTrackingPointer(event.getPointerId(event.actionIndex))

open fun shouldRequireToWaitForFailure(handler: GestureHandler): Boolean {
if (handler === this) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ class GestureHandlerOrchestrator(
// on Arrays.sort providing a stable sort (as children are registered in order in which they
// should be tested)
preparedHandlers.sortWith(handlersComparator)

for (handler in preparedHandlers) {
deliverEventToGestureHandler(handler, event)
}
Expand All @@ -273,7 +274,8 @@ class GestureHandlerOrchestrator(
handler.cancel()
return
}
if (!handler.wantEvents()) {

if (!handler.wantsEvent(sourceEvent)) {
return
}

Expand Down