summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-05-16 12:27:08 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-05-16 12:27:08 -0300
commit3a1d8375f704333ea73ea38d85fc2d87a57eedd0 (patch)
tree516d5c302831e953be07b304cc329914dd04676f
parent40c0e1993aa28f580b9bf597abc8902b5d5c1e93 (diff)
parentbc3afc8ed8659c1aea2fa349a7d826f7f01e39ef (diff)
Merge pull request #1908 from vipsbpig/master
fix multitouch release problem
-rw-r--r--platform/android/java/src/com/android/godot/Godot.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/android/java/src/com/android/godot/Godot.java b/platform/android/java/src/com/android/godot/Godot.java
index e0ac6b0f12..4f42a1a82b 100644
--- a/platform/android/java/src/com/android/godot/Godot.java
+++ b/platform/android/java/src/com/android/godot/Godot.java
@@ -747,7 +747,8 @@ public class Godot extends Activity implements SensorEventListener, IDownloaderC
//}
} break;
case MotionEvent.ACTION_POINTER_UP: {
- int pointer_idx = event.getActionIndex();
+ final int indexPointUp = event.getAction() >> MotionEvent.ACTION_POINTER_INDEX_SHIFT;
+ final int pointer_idx = event.getPointerId(indexPointUp);
GodotLib.touch(4,pointer_idx,evcount,arr);
//System.out.printf("%d - s.up at: %f,%f\n",pointer_idx, event.getX(pointer_idx),event.getY(pointer_idx));
} break;