Skip to content
Merged
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 @@ -1660,7 +1660,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
playerBinding?.playerIntroPlay?.isGone = true

// Handle pan with two fingers
if (event.pointerCount == 2 && !isLocked && isFullScreenPlayer && !hasTriggeredSpeedUp && currentTouchAction == null) {
if ((event.pointerCount == 2 || lastPan != null) && !isLocked && isFullScreenPlayer && !hasTriggeredSpeedUp && currentTouchAction == null) {
holdhandler.removeCallbacks(holdRunnable) // remove 2x speed

// Gesture detectors for zoom & pan
Expand Down Expand Up @@ -1695,7 +1695,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
lastPan = newPan
}

MotionEvent.ACTION_POINTER_UP, MotionEvent.ACTION_UP -> {
MotionEvent.ACTION_CANCEL, MotionEvent.ACTION_POINTER_UP, MotionEvent.ACTION_UP -> {
// Reset touch
lastPan = null
currentTouchStart = null
Expand Down Expand Up @@ -1777,7 +1777,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
}
}

MotionEvent.ACTION_UP -> {
MotionEvent.ACTION_CANCEL, MotionEvent.ACTION_UP -> {
holdhandler.removeCallbacks(holdRunnable)
if (hasTriggeredSpeedUp) {
player.setPlaybackSpeed(DataStoreHelper.playBackSpeed)
Expand Down