Merge lp:~aacid/unity8/pan_regression into lp:unity8

[Albert Astals Cid]

Fix regression making pan not possible in Zoomable Image

Qt never seems to send two presses standalone since that confuses code that still works on mouse events, the second one is always part of a move.
Also make the test check panning works so that it may be harder to regress again

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[lp:~aacid/unity8/pan_regression]

1667. By Albert Astals Cid on 2015-03-18

spacing

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes
 * Did CI run pass? If not, please explain why.
waiting
 * Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1667
http://jenkins.qa.ubuntu.com/job/unity8-ci/5446/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1827
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/610
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/611
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/611
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1615
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1825
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1825/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18943

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5446/rebuild

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

unrelated failures

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1667
http://jenkins.qa.ubuntu.com/job/unity8-ci/5450/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1847
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/614
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/615
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/615
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1633
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1845
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1845/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18975

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5450/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'qml/Components/ZoomableImage.qml'
--- qml/Components/ZoomableImage.qml	2015-02-20 11:54:34 +0000
+++ qml/Components/ZoomableImage.qml	2015-03-18 14:41:30 +0000
@@ -107,6 +107,20 @@
             }
         }
 
+        PinchArea {
+            id: pinchArea
+            objectName: "pinchArea"
+            property real minScale: 1.0
+            anchors.fill: parent
+            enabled: zoomable ? zoomable : false
+
+            pinch.target: image
+            pinch.minimumScale: minScale
+            pinch.maximumScale: 10
+
+            onPinchFinished: flickable.returnToBounds()
+        }
+
         MouseArea {
             id: mouseArea
             objectName: "mouseArea"
@@ -139,18 +153,4 @@
             }
         }
     }
-
-    PinchArea {
-        id: pinchArea
-        objectName: "pinchArea"
-        property real minScale: 1.0
-        anchors.fill: flickable
-        enabled: zoomable ? zoomable : false
-
-        pinch.target: image
-        pinch.minimumScale: minScale
-        pinch.maximumScale: 10
-
-        onPinchFinished: flickable.returnToBounds()
-    }
 }

=== modified file 'tests/qmltests/Components/tst_ZoomableImage.qml'
--- tests/qmltests/Components/tst_ZoomableImage.qml	2014-10-21 21:16:36 +0000
+++ tests/qmltests/Components/tst_ZoomableImage.qml	2015-03-18 14:41:30 +0000
@@ -182,6 +182,13 @@
                 compare(flickable.contentWidth, Math.max(imageRenderer.width * image.scale, flickable.width));
                 compare(flickable.contentHeight, Math.max(imageRenderer.height * image.scale, flickable.height));
 
+                // try pan it a bit
+                var contentX = flickable.contentX;
+                var contentY = flickable.contentY;
+                touchFlick(zoomableImage, units.gu(1), units.gu(1), units.gu(10), units.gu(10));
+                tryCompare(flickable, "moving", false)
+                tryCompareFunction(function() { return flickable.contentX != contentX && flickable.contentY != contentY; }, zoomableImage.zoomable)
+
                 wait(3000); // have to delay between two consequent pinch event.
                 // pinch zoom-out
                 touchPinch(zoomableImage, x1End, y1End, x1Start, y1Start, x2End, y2End, x2Start, y2Start);

=== modified file 'tests/utils/modules/Unity/Test/UnityTestCase.qml'
--- tests/utils/modules/Unity/Test/UnityTestCase.qml	2015-02-17 15:06:33 +0000
+++ tests/utils/modules/Unity/Test/UnityTestCase.qml	2015-03-18 14:41:30 +0000
@@ -292,7 +292,7 @@
         event1.press(0, x1Start, y1Start);
         event1.commit();
         // second finger
-        event1.stationary(0);
+        event1.move(0, x1Start, y1Start);
         event1.press(1, x2Start, y2Start);
         event1.commit();