From b9afe4f6b969c38d9009f5574cc2df95a8f77627 Mon Sep 17 00:00:00 2001 From: SerpentSpirale Date: Sun, 1 Aug 2021 21:51:51 +0200 Subject: [PATCH] Hotfix for mouse passthrough slight jump --- .../src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java | 2 +- .../kdt/pojavlaunch/customcontrols/buttons/ControlButton.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java index 15af883b1..b584c71de 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java @@ -348,7 +348,7 @@ public class BaseMainActivity extends LoggableActivity { switch (e.getActionMasked()) { case MotionEvent.ACTION_DOWN: // 0 - shouldBeDown = true; + //shouldBeDown = true; CallbackBridge.sendPrepareGrabInitialPos(); currentPointerID = e.getPointerId(0); diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlButton.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlButton.java index 1f4ca2d64..436cb2771 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlButton.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlButton.java @@ -262,6 +262,10 @@ public class ControlButton extends androidx.appcompat.widget.AppCompatButton imp case MotionEvent.ACTION_UP: // 1 case MotionEvent.ACTION_CANCEL: // 3 case MotionEvent.ACTION_POINTER_UP: // 6 + if(mProperties.passThruEnabled){ + MinecraftGLView v = ((ControlLayout) this.getParent()).findViewById(R.id.main_game_render_view); + if (v != null) v.dispatchTouchEvent(event); + } if(isPointerOutOfBounds) ((ControlLayout) getParent()).onTouch(this, event); isPointerOutOfBounds = false;