Merge pull request appium#289 from kkhaidukov/master

Jonahss · Jonahss · commit cfef7a24cb12 · 2016-01-15T13:29:02.000-08:00
fixed zoom gestures in AppiumDriver.java (issue appium#288)
diff --git a/src/main/java/io/appium/java_client/AppiumDriver.java b/src/main/java/io/appium/java_client/AppiumDriver.java
@@ -446,8 +446,8 @@ public void zoom(WebElement el) {
     Point center = new Point(upperLeft.getX() + dimensions.getWidth() / 2, upperLeft.getY() + dimensions.getHeight() / 2);
     int yOffset = center.getY() - upperLeft.getY();
 
-    TouchAction action0 = new TouchAction(this).press(el).moveTo(el, center.getX(), center.getY() - yOffset).release();
-    TouchAction action1 = new TouchAction(this).press(el).moveTo(el, center.getX(), center.getY() + yOffset).release();
+    TouchAction action0 = new TouchAction(this).press(center.getX(), center.getY()).moveTo(el, center.getX(), center.getY() - yOffset).release();
+    TouchAction action1 = new TouchAction(this).press(center.getX(), center.getY()).moveTo(el, center.getX(), center.getY() + yOffset).release();
 
     multiTouch.add(action0).add(action1);
 
@@ -477,8 +477,8 @@ public void zoom(int x, int y) {
       yOffset = scrHeight - y;
     }
 
-    TouchAction action0 = new TouchAction(this).press(x, y).moveTo(x, y - yOffset).release();
-    TouchAction action1 = new TouchAction(this).press(x, y).moveTo(x, y + yOffset).release();
+    TouchAction action0 = new TouchAction(this).press(x, y).moveTo(0, -yOffset).release();
+    TouchAction action1 = new TouchAction(this).press(x, y).moveTo(0, yOffset).release();
 
     multiTouch.add(action0).add(action1);
 
