From 9b58e7bb4dc8897541f31d5575b592ef71e9cee8 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Thu, 6 Nov 2014 20:38:29 -0800 Subject: [PATCH] Fix right clicking inconsistency on different devices --- app/src/main/java/com/limelight/Game.java | 7 ++++++- .../java/com/limelight/binding/input/TouchContext.java | 9 ++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/limelight/Game.java b/app/src/main/java/com/limelight/Game.java index 7540a157..5cbad9f4 100644 --- a/app/src/main/java/com/limelight/Game.java +++ b/app/src/main/java/com/limelight/Game.java @@ -517,7 +517,12 @@ public class Game extends Activity implements SurfaceHolder.Callback, // ACTION_MOVE is special because it always has actionIndex == 0 // We'll call the move handlers for all indexes manually for (TouchContext aTouchContextMap : touchContextMap) { - aTouchContextMap.touchMoveEvent(eventX, eventY); + if (aTouchContextMap.getActionIndex() < event.getPointerCount()) + { + aTouchContextMap.touchMoveEvent( + (int)event.getX(aTouchContextMap.getActionIndex()), + (int)event.getY(aTouchContextMap.getActionIndex())); + } } break; default: diff --git a/app/src/main/java/com/limelight/binding/input/TouchContext.java b/app/src/main/java/com/limelight/binding/input/TouchContext.java index 4d66fec8..94921bea 100644 --- a/app/src/main/java/com/limelight/binding/input/TouchContext.java +++ b/app/src/main/java/com/limelight/binding/input/TouchContext.java @@ -21,6 +21,11 @@ public class TouchContext { this.conn = conn; this.actionIndex = actionIndex; } + + public int getActionIndex() + { + return actionIndex; + } private boolean isTap() { @@ -84,10 +89,8 @@ public class TouchContext { lastTouchX = eventX; lastTouchY = eventY; - - return true; } - return false; + return true; } }