From feff4f38c8aedadb88c6aa8ea413a0f020489a17 Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Sun, 15 Nov 2020 19:39:26 +0700 Subject: [PATCH] Integrate scrolling into single finger --- .../java/net/kdt/pojavlaunch/MainActivity.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java b/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java index 9a8228578..29f9cd011 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java @@ -380,6 +380,7 @@ public class MainActivity extends LoggableActivity implements OnTouchListener, O } else { switch (e.getActionMasked()) { case MotionEvent.ACTION_DOWN: // 0 + case MotionEvent.ACTION_POINTER_DOWN: // 5 CallbackBridge.sendPrepareGrabInitialPos(); isTouchInHotbar = hudKeyHandled != -1; @@ -404,10 +405,15 @@ public class MainActivity extends LoggableActivity implements OnTouchListener, O initialY = y; theHandler.sendEmptyMessageDelayed(MainActivity.MSG_LEFT_MOUSE_BUTTON_CHECK, LauncherPreferences.PREF_LONGPRESS_TRIGGER); } + + CallbackBridge.sendScroll(x - scrollInitialX, y - scrollInitialY); + scrollInitialX = x; + scrollInitialY = y; } break; case MotionEvent.ACTION_UP: // 1 + case MotionEvent.ACTION_POINTER_UP: // 6 case MotionEvent.ACTION_CANCEL: // 3 if (!isTouchInHotbar) { CallbackBridge.mouseX = x; @@ -442,10 +448,12 @@ public class MainActivity extends LoggableActivity implements OnTouchListener, O } } + scrollInitialX = x; + scrollInitialY = y; + break; - +/* case MotionEvent.ACTION_POINTER_DOWN: // 5 - case MotionEvent.ACTION_POINTER_INDEX_SHIFT: CallbackBridge.sendScroll(x - scrollInitialX, y - scrollInitialY); scrollInitialX = x; scrollInitialY = y; @@ -455,7 +463,7 @@ public class MainActivity extends LoggableActivity implements OnTouchListener, O scrollInitialX = x; scrollInitialY = y; break; - + */ default: if (!isTouchInHotbar) { CallbackBridge.mouseX = x;