From 726ff9fd0a1cabf57ed641d08bd622903d231a83 Mon Sep 17 00:00:00 2001 From: Robert Edwards Date: Mon, 25 Oct 2021 07:36:11 -0400 Subject: [PATCH] Fix for Android double tap not triggering correctly #46100 and #46101. Changes the buttonMask for doubleTap input on android to recognize both Mouse and Screen Touch inputs. --- .../src/org/godotengine/godot/input/GodotGestureHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.java b/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.java index 6b248fd0344c5..8ed34904c4dbd 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.java +++ b/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.java @@ -74,7 +74,7 @@ public boolean onDoubleTap(MotionEvent event) { //Log.i("GodotGesture", "onDoubleTap"); final int x = Math.round(event.getX()); final int y = Math.round(event.getY()); - final int buttonMask = event.getButtonState(); + final int buttonMask = event.getButtonState() + (event.getToolType(event.getActionIndex()) != MotionEvent.TOOL_TYPE_MOUSE ? 1 : 0) * event.getPointerCount(); GodotLib.doubleTap(buttonMask, x, y); return true; }