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

Fix[input]: also check for double taps on ACTION_DOWN/ACTION_POINTER_DOWN

Browse Source
This commit is contained in:
artdeell 2024-04-06 16:22:43 -04:00 committed by Maksim Belov
parent e6d5e073d8
commit 781341eafd
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/mouse/HotbarTracker.java
View File

@ -1,5 +1,8 @@
package net.kdt.pojavlaunch.customcontrols.mouse;
import static net.kdt.pojavlaunch.utils.MCOptionUtils.getMcScale;
import android.os.Handler;
import android.view.MotionEvent;
import net.kdt.pojavlaunch.LwjglGlfwKeycode;
@ -8,10 +11,6 @@ import net.kdt.pojavlaunch.utils.MCOptionUtils;
import org.lwjgl.glfw.CallbackBridge;
import static net.kdt.pojavlaunch.utils.MCOptionUtils.getMcScale;
import android.os.Handler;
public class HotbarTracker implements MCOptionUtils.MCOptionListener {
private static final int[] HOTBAR_KEYS = {
@ -35,14 +34,14 @@ public class HotbarTracker implements MCOptionUtils.MCOptionListener {
mHudPointerId = -1;
}
public boolean begin(MotionEvent motionEvent) {
public boolean begin(MotionEvent motionEvent, boolean hasDoubleTapped) {
if(mHudPointerId != -1) return false;
int pointer = motionEvent.getActionIndex();
if(motionEvent.getActionMasked() == MotionEvent.ACTION_DOWN) pointer = 0;
int x = (int)motionEvent.getX(pointer);
if(isWithinHotbar(x, (int)motionEvent.getY(pointer))) {
mHudPointerId = motionEvent.getPointerId(pointer);
hotbarClick(x);
hotbarClick(x, hasDoubleTapped);
mDropGesture.submit(true);
return true;
}else {
@ -60,11 +59,8 @@ public class HotbarTracker implements MCOptionUtils.MCOptionListener {
}
int x = (int)motionEvent.getX(index);
if(isWithinHotbar(x, (int)motionEvent.getY(index))) {
hotbarClick(x);
hotbarClick(x, hasDoubleTapped);
mDropGesture.submit(true);
if(hasDoubleTapped && !LauncherPreferences.PREF_DISABLE_SWAP_HAND) {
CallbackBridge.sendKeyPress(LwjglGlfwKeycode.GLFW_KEY_F);
}
}else {
mDropGesture.submit(false);
}
@ -84,7 +80,11 @@ public class HotbarTracker implements MCOptionUtils.MCOptionListener {
return x >= barX && x < barX + mBarWidth;
}
private void hotbarClick(int x) {
private void hotbarClick(int x, boolean hasDoubleTapped) {
if(hasDoubleTapped && !LauncherPreferences.PREF_DISABLE_SWAP_HAND) {
CallbackBridge.sendKeyPress(LwjglGlfwKeycode.GLFW_KEY_F);
}
int barX = (CallbackBridge.physicalWidth / 2) - (mBarWidth / 2);
if(x < barX || x >= barX + mBarWidth) return;

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

@ -28,13 +28,13 @@ public class InGameEventProcessor implements TouchEventProcessor {
boolean hasDoubleTapped = mDoubleTapDetector.onTouchEvent(motionEvent);
switch (motionEvent.getActionMasked()) {
case MotionEvent.ACTION_DOWN:
if(mGuiBarTracker.begin(motionEvent)) break;
if(mGuiBarTracker.begin(motionEvent, hasDoubleTapped)) break;
mTracker.startTracking(motionEvent);
if(LauncherPreferences.PREF_DISABLE_GESTURES) break;
checkGestures();
break;
case MotionEvent.ACTION_POINTER_DOWN:
mGuiBarTracker.begin(motionEvent);
mGuiBarTracker.begin(motionEvent, hasDoubleTapped);
break;
case MotionEvent.ACTION_MOVE:
int trackedIndex = mTracker.trackEvent(motionEvent);