summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--remoting/android/java/src/org/chromium/chromoting/TouchInputHandler.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/remoting/android/java/src/org/chromium/chromoting/TouchInputHandler.java b/remoting/android/java/src/org/chromium/chromoting/TouchInputHandler.java
index 4de7aea..603a6e7 100644
--- a/remoting/android/java/src/org/chromium/chromoting/TouchInputHandler.java
+++ b/remoting/android/java/src/org/chromium/chromoting/TouchInputHandler.java
@@ -390,6 +390,11 @@ public class TouchInputHandler implements TouchInputHandlerInterface {
}
if (pointerCount == 2 && mSwipePinchDetector.isSwiping()) {
+ if (!mInputStrategy.isIndirectInputMode()) {
+ // Ensure the cursor is located at the coordinates of the original event,
+ // otherwise the target window may not receive the scroll event correctly.
+ moveCursorToScreenPoint(e1.getX(), e1.getY());
+ }
mInputStrategy.onScroll(distanceX, distanceY);
// Prevent the cursor being moved or flung by the gesture.