Merge lp:~nikwen/ubuntu-terminal-app/scrolling-improvements-2 into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

[Niklas Wenzel]

Detect whether the swipe is a swipe in x or y direction by comparing the length of the swipe in each direction instead of simply preferring y over x swipes

Detect whether the swipe is a swipe in x or y direction by comparing the length of the swipe in each direction instead of simply preferring y over x swipes.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:93
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/157/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2963
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2963/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/78
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-vivid-amd64-ci/41

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/157/rebuild

review: Approve (continuous-integration)

[Filippo Scognamiglio (flscogna)]

Thank you very much for the patch Niklas. Looks really nice to me. :)

review: Approve

[Niklas Wenzel (nikwen)]

Thank you for merging it, Filippo. :)

=== modified file 'src/app/qml/TerminalInputArea.qml'
--- src/app/qml/TerminalInputArea.qml	2015-06-14 15:42:15 +0000
+++ src/app/qml/TerminalInputArea.qml	2015-06-19 20:56:39 +0000
@@ -93,23 +93,25 @@
             if (__multiTouch || multiTouchTimer.running) // Do not handle multi touch events here and detect multi touch swipes while the timer is running
                 return;
 
-            var dragValue = touchPoints[0].y - __pressPosition.y;
+            var dragValueY = touchPoints[0].y - __pressPosition.y;
             var dragValueX = touchPoints[0].x - __pressPosition.x;
-            var dragSteps = dragValue / swipeDelta;
+            var dragStepsY = dragValueY / swipeDelta;
             var dragStepsX = dragValueX / swipeDelta;
 
-            var dragStepsFloorY = absFloor(dragSteps);
+            var dragStepsFloorY = absFloor(dragStepsY);
             var dragStepsFloorX = absFloor(dragStepsX);
 
-            if (!__moved && distance(touchPoints[0], __pressPosition) > swipeDelta)
+            if (!__moved && distance(touchPoints[0], __pressPosition) > swipeDelta) {
                 __moved = true;
+                __dragging = (Math.abs(dragValueY) >= Math.abs(dragValueX)) ? yDragging : xDragging;
+            } else if (!__moved) {
+                return;
+            }
 
-            if (__dragging !== xDragging && dragStepsFloorY !== __prevDragStepsY) {
+            if (__dragging === yDragging && dragStepsFloorY !== __prevDragStepsY) {
                 swipeYDetected(dragStepsFloorY - __prevDragStepsY);
-                __dragging = yDragging;
-            } else if (__dragging !== yDragging && dragStepsFloorX !== __prevDragStepsX) {
+            } else if (__dragging === xDragging && dragStepsFloorX !== __prevDragStepsX) {
                 swipeXDetected(dragStepsFloorX - __prevDragStepsX);
-                __dragging = xDragging;
             }
 
             __prevDragStepsY = dragStepsFloorY;