Changeset af661f4 in guacamole-common-js

Timestamp:

04/09/12 00:22:09 (14 months ago)

Author:

zhangmaike

Branches:

master, guacamole-debian-parent, unstable

Children:

a5b79eb

Parents:

a76549c

git-author:

Michael Jumper <zhangmaike@…> (04/09/12 00:22:09)

git-committer:

Michael Jumper <zhangmaike@…> (04/09/12 00:22:09)

Message:

Avoid crazy accelerating autoscroll by using clientX/clientY instead of screenX/screenY.

File:

• src/main/resources/mouse.js (modified) (4 diffs)

src/main/resources/mouse.js

@@ -254 +254 @@
             // Record touch location and time
             var starting_touch = e.touches[0];
-            last_touch_x = starting_touch.screenX;
-            last_touch_y = starting_touch.screenY;
+            last_touch_x = starting_touch.clientX;
+            last_touch_y = starting_touch.clientY;
             last_touch_time = new Date().getTime();
             pixels_moved = 0;
@@ -269 +269 @@
         // Get change in touch location
         var touch = e.touches[0];
-        var delta_x = touch.screenX - last_touch_x;
-        var delta_y = touch.screenY - last_touch_y;
+        var delta_x = touch.clientX - last_touch_x;
+        var delta_y = touch.clientY - last_touch_y;
 
         // Track pixels moved
@@ -299 +299 @@
 
             // Update touch location
-            last_touch_x = touch.screenX;
-            last_touch_y = touch.screenY;
+            last_touch_x = touch.clientX;
+            last_touch_y = touch.clientY;
 
         }
@@ -327 +327 @@
                 // Only update touch location after a scroll has been
                 // detected
-                last_touch_x = touch.screenX;
-                last_touch_y = touch.screenY;
+                last_touch_x = touch.clientX;
+                last_touch_y = touch.clientY;
 
             }