2009Scape/2009Scape-mobile
1
0
Fork 0
mirror of https://github.com/2009scape/2009Scape-mobile.git synced 2025-12-20 05:20:14 -07:00
Code Issues Projects Releases Packages Wiki Activity

Integrate scrolling into single finger

Browse source
This commit is contained in:
khanhduytran0 2020-11-15 19:39:26 +07:00
parent 0211102f23
commit feff4f38c8
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/net/kdt/pojavlaunch/MainActivity.java
View file

@ -380,6 +380,7 @@ public class MainActivity extends LoggableActivity implements OnTouchListener, O
} else { } else {
switch (e.getActionMasked()) { switch (e.getActionMasked()) {
case MotionEvent.ACTION_DOWN: // 0 case MotionEvent.ACTION_DOWN: // 0
case MotionEvent.ACTION_POINTER_DOWN: // 5
CallbackBridge.sendPrepareGrabInitialPos(); CallbackBridge.sendPrepareGrabInitialPos();
isTouchInHotbar = hudKeyHandled != -1; isTouchInHotbar = hudKeyHandled != -1;
@ -404,10 +405,15 @@ public class MainActivity extends LoggableActivity implements OnTouchListener, O
initialY = y; initialY = y;
theHandler.sendEmptyMessageDelayed(MainActivity.MSG_LEFT_MOUSE_BUTTON_CHECK, LauncherPreferences.PREF_LONGPRESS_TRIGGER); theHandler.sendEmptyMessageDelayed(MainActivity.MSG_LEFT_MOUSE_BUTTON_CHECK, LauncherPreferences.PREF_LONGPRESS_TRIGGER);
} }
CallbackBridge.sendScroll(x - scrollInitialX, y - scrollInitialY);
scrollInitialX = x;
scrollInitialY = y;
} }
break; break;
case MotionEvent.ACTION_UP: // 1 case MotionEvent.ACTION_UP: // 1
case MotionEvent.ACTION_POINTER_UP: // 6
case MotionEvent.ACTION_CANCEL: // 3 case MotionEvent.ACTION_CANCEL: // 3
if (!isTouchInHotbar) { if (!isTouchInHotbar) {
CallbackBridge.mouseX = x; CallbackBridge.mouseX = x;
@ -442,10 +448,12 @@ public class MainActivity extends LoggableActivity implements OnTouchListener, O
} }
} }
scrollInitialX = x;
scrollInitialY = y;
break; break;
/*
case MotionEvent.ACTION_POINTER_DOWN: // 5 case MotionEvent.ACTION_POINTER_DOWN: // 5
case MotionEvent.ACTION_POINTER_INDEX_SHIFT:
CallbackBridge.sendScroll(x - scrollInitialX, y - scrollInitialY); CallbackBridge.sendScroll(x - scrollInitialX, y - scrollInitialY);
scrollInitialX = x; scrollInitialX = x;
scrollInitialY = y; scrollInitialY = y;
@ -455,7 +463,7 @@ public class MainActivity extends LoggableActivity implements OnTouchListener, O
scrollInitialX = x; scrollInitialX = x;
scrollInitialY = y; scrollInitialY = y;
break; break;
*/
default: default:
if (!isTouchInHotbar) { if (!isTouchInHotbar) {
CallbackBridge.mouseX = x; CallbackBridge.mouseX = x;