mirror/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2026-04-18 08:36:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(SideDialog): Didn't properly register AndroidPointerCapture

Browse Source
This commit is contained in:
alexytomi
2025-07-25 17:01:00 +08:00
parent 6e6c20c450
commit 7f79283bcd
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,9 +1,11 @@
package net.kdt.pojavlaunch.customcontrols.mouse;
import static net.kdt.pojavlaunch.prefs.LauncherPreferences.DEFAULT_PREF;
import static net.kdt.pojavlaunch.prefs.LauncherPreferences.PREF_MOUSE_GRAB_FORCE;
import android.content.SharedPreferences;
import android.os.Build;
import android.util.Log;
import android.view.InputDevice;
import android.view.MotionEvent;
import android.view.View;
@@ -37,12 +39,13 @@ public class AndroidPointerCapture implements ViewTreeObserver.OnWindowFocusChan
this.mHostView = hostView;
hostView.setOnCapturedPointerListener(this);
hostView.getViewTreeObserver().addOnWindowFocusChangeListener(this);
DEFAULT_PREF.registerOnSharedPreferenceChangeListener(this);
if (!PREF_MOUSE_GRAB_FORCE)
CallbackBridge.addGrabListener(this);
}
private void enableTouchpadIfNecessary() {
if(!mTouchpad.getDisplayState() && !Tools.isPointerDeviceConnected()) mTouchpad.enable(true);
if(!mTouchpad.getDisplayState() && PREF_MOUSE_GRAB_FORCE) mTouchpad.enable(true);
}
// Needed so it releases the cursor when inside game menu
@@ -57,7 +60,7 @@ public class AndroidPointerCapture implements ViewTreeObserver.OnWindowFocusChan
}
private void updateCursorState(boolean isGrabbing) {
if (!isGrabbing // Only capture if not in menu and user said so
&& !PREF_MOUSE_GRAB_FORCE) {
&& !PREF_MOUSE_GRAB_FORCE) {
mHostView.releasePointerCapture(); // Release the capture since user said so
}
// Capture the pointer when not inside a menu
@@ -68,6 +71,7 @@ public class AndroidPointerCapture implements ViewTreeObserver.OnWindowFocusChan
public void handleAutomaticCapture() {
if (!CallbackBridge.isGrabbing() // Only capture if not in menu and user said so
&& !PREF_MOUSE_GRAB_FORCE) {
mTouchpad.disable();
return;
}
if (mHostView.hasPointerCapture()) {