TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-13 06:39:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix[input]: ignore the right click gesture for non-fresh inputs

Browse Source
This commit is contained in:
artdeell 2024-04-08 11:57:45 -04:00 committed by Maksim Belov
parent 7add2f85dd
commit 13cad686ec
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/mouse/InGameEventProcessor.java
View File

@ -11,6 +11,7 @@ import org.lwjgl.glfw.CallbackBridge;
public class InGameEventProcessor implements TouchEventProcessor { public class InGameEventProcessor implements TouchEventProcessor {
private final Handler mGestureHandler = new Handler(Looper.getMainLooper()); private final Handler mGestureHandler = new Handler(Looper.getMainLooper());
private final double mSensitivity; private final double mSensitivity;
private boolean mEventTransitioned = true;
private final PointerTracker mTracker = new PointerTracker(); private final PointerTracker mTracker = new PointerTracker();
private final LeftClickGesture mLeftClickGesture = new LeftClickGesture(mGestureHandler); private final LeftClickGesture mLeftClickGesture = new LeftClickGesture(mGestureHandler);
private final RightClickGesture mRightClickGesture = new RightClickGesture(mGestureHandler); private final RightClickGesture mRightClickGesture = new RightClickGesture(mGestureHandler);
@ -25,6 +26,7 @@ public class InGameEventProcessor implements TouchEventProcessor {
case MotionEvent.ACTION_DOWN: case MotionEvent.ACTION_DOWN:
mTracker.startTracking(motionEvent); mTracker.startTracking(motionEvent);
if(LauncherPreferences.PREF_DISABLE_GESTURES) break; if(LauncherPreferences.PREF_DISABLE_GESTURES) break;
mEventTransitioned = false;
checkGestures(); checkGestures();
break; break;
case MotionEvent.ACTION_MOVE: case MotionEvent.ACTION_MOVE:
@ -51,10 +53,14 @@ public class InGameEventProcessor implements TouchEventProcessor {
private void checkGestures() { private void checkGestures() {
mLeftClickGesture.inputEvent(); mLeftClickGesture.inputEvent();
mRightClickGesture.inputEvent(); // Only register right click events if it's a fresh event stream, not one after a transition.
// This is done to avoid problems when people hold the button for just a bit too long after
// exiting a menu for example.
if(!mEventTransitioned) mRightClickGesture.inputEvent();
} }
private void cancelGestures(boolean isSwitching) { private void cancelGestures(boolean isSwitching) {
mEventTransitioned = true;
mLeftClickGesture.cancel(isSwitching); mLeftClickGesture.cancel(isSwitching);
mRightClickGesture.cancel(isSwitching); mRightClickGesture.cancel(isSwitching);
} }