diff options
| author | Fredia Huya-Kouadio <fhuya@meta.com> | 2022-12-14 18:23:17 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-14 18:23:17 -0800 |
| commit | ec4de82ab322504cf1775fe76fe93e77d5f1f71e (patch) | |
| tree | af71a1768380ed4eb81bfbea92a1b80376e2929c /platform | |
| parent | 1c5cfc4675826db05d6e7dc42b337e8b1282de08 (diff) | |
| parent | 408000752cb39f93b2639fdeefb783e4dd76910f (diff) | |
Merge pull request #69990 from exoticorn/fix-android-touch-input
Fix ambiguous touch input events on Android
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java b/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java index 2f26497cc8..0ba86e4316 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java +++ b/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java @@ -422,7 +422,7 @@ public class GodotInputHandler implements InputManager.InputDeviceListener { } private static boolean isMouseEvent(int eventSource) { - boolean mouseSource = ((eventSource & InputDevice.SOURCE_MOUSE) == InputDevice.SOURCE_MOUSE) || ((eventSource & InputDevice.SOURCE_STYLUS) == InputDevice.SOURCE_STYLUS); + boolean mouseSource = ((eventSource & InputDevice.SOURCE_MOUSE) == InputDevice.SOURCE_MOUSE) || ((eventSource & (InputDevice.SOURCE_TOUCHSCREEN | InputDevice.SOURCE_STYLUS)) == InputDevice.SOURCE_STYLUS); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { mouseSource = mouseSource || ((eventSource & InputDevice.SOURCE_MOUSE_RELATIVE) == InputDevice.SOURCE_MOUSE_RELATIVE); } |