From ed35e1749ffc8d171e96f545a4e4463e81d44746 Mon Sep 17 00:00:00 2001 From: jaredtech Date: Thu, 30 Mar 2023 12:20:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E9=98=85=E8=AF=BB=E6=97=B6,?= =?UTF-8?q?=E5=A4=9A=E6=8C=87=E8=A7=A6=E6=91=B8=E9=80=A0=E6=88=90=E9=97=AA?= =?UTF-8?q?=E7=83=81=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../read/page/delegate/ScrollPageDelegate.kt | 22 +++---------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/delegate/ScrollPageDelegate.kt b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/ScrollPageDelegate.kt index c3f9dc558..fcbe852f4 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/page/delegate/ScrollPageDelegate.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/ScrollPageDelegate.kt @@ -58,26 +58,10 @@ class ScrollPageDelegate(readView: ReadView) : PageDelegate(readView) { private fun onScroll(event: MotionEvent) { mVelocity.addMovement(event) mVelocity.computeCurrentVelocity(velocityDuration) - val action: Int = event.action - val pointerUp = - action and MotionEvent.ACTION_MASK == MotionEvent.ACTION_POINTER_UP - val skipIndex = if (pointerUp) event.actionIndex else -1 - // Determine focal point - var sumX = 0f - var sumY = 0f - val count: Int = event.pointerCount - for (i in 0 until count) { - if (skipIndex == i) continue - sumX += event.getX(i) - sumY += event.getY(i) - } - val div = if (pointerUp) count - 1 else count - val focusX = sumX / div - val focusY = sumY / div - readView.setTouchPoint(sumX, sumY) + readView.setTouchPoint(event.getX(0), event.getY(0)) if (!isMoved) { - val deltaX = (focusX - startX).toInt() - val deltaY = (focusY - startY).toInt() + val deltaX = (event.getX(0) - startX).toInt() + val deltaY = (event.getY(0) - startY).toInt() val distance = deltaX * deltaX + deltaY * deltaY isMoved = distance > readView.slopSquare }