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

Hotfix for the mouse passthrough jumping issue.

Browse source
This commit is contained in:
SerpentSpirale 2021-07-28 15:56:14 +02:00
parent c8afe149df
commit d927d19723
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
View file

@ -312,6 +312,11 @@ public class BaseMainActivity extends LoggableActivity {
minecraftGLView.setFocusable(true);
glTouchListener = new OnTouchListener(){
private boolean isTouchInHotbar = false;
/*
* Events can start with only a move instead of an pointerDown
* It is due to the mouse passthrough option bundled with the control button.
*/
private boolean shouldBeDown = false;
@Override
public boolean onTouch(View p1, MotionEvent e) {
@ -343,6 +348,7 @@ public class BaseMainActivity extends LoggableActivity {
switch (e.getActionMasked()) {
case MotionEvent.ACTION_DOWN: // 0
shouldBeDown = true;
CallbackBridge.sendPrepareGrabInitialPos();
currentPointerID = e.getPointerId(0);
@ -373,6 +379,7 @@ public class BaseMainActivity extends LoggableActivity {
case MotionEvent.ACTION_UP: // 1
case MotionEvent.ACTION_CANCEL: // 3
shouldBeDown = false;
if (!isTouchInHotbar) {
// -TODO uncomment after fix wrong trigger
if (!rightOverride) CallbackBridge.mouseLeft = false;
@ -415,7 +422,8 @@ public class BaseMainActivity extends LoggableActivity {
//Camera movement
if(CallbackBridge.isGrabbing()){
int pointerIndex = e.findPointerIndex(currentPointerID);
if(pointerIndex == -1){
if(pointerIndex == -1 || !shouldBeDown){
shouldBeDown = true;
currentPointerID = e.getPointerId(0);
}else{
mouse_x += (e.getX(pointerIndex) - prevX) * sensitivityFactor;