Merge lp:~cimi/unity8/fix-1195349 into lp:unity8

[Andrea Cimitan]

Fix 1195349 by counting drawbuffer on the newContentX logic of the carousel

When we changed carousel from repeater to listview, we added drawbuffer. this breaks the logic of newContentX, which was considered disabled and set to -1. The correct disabled value now has to take into account the drawbuffer.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:467
http://jenkins.qa.ubuntu.com/job/unity8-ci/1438/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/5073
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/3013
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2306
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/461
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1438
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1438/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1437
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1241
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/948
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/948/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/3015
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/3015/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2520
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2564
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/49
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/48

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1438/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Can this be autotested?

review: Needs Information

[Andrea Cimitan (cimi)]

> Can this be autotested?

Don't think so. We currently cover the maths for the carousel, but the real UI is not really easily testable. I think it's better to do manual testing and have the human feedback for it. If something breaks you can spot it immediately, while a computer might test only few cases but not the whole dynamic picture (that the carousel is about)...

[Albert Astals Cid (aacid)]

Works

review: Approve

=== modified file 'Components/Carousel.qml'
--- Components/Carousel.qml	2013-07-17 16:27:23 +0000
+++ Components/Carousel.qml	2013-10-16 16:40:03 +0000
@@ -72,7 +72,7 @@
         id: listView
 
         property real minimumTileWidth: 0
-        property real newContentX: -1
+        property real newContentX: disabledNewContentX
         property real pathItemCount: referenceWidth / referenceTileWidth
         property real tileAspectRatio: 1
 
@@ -100,6 +100,7 @@
         readonly property real kMiddleIndex: (realWidth / 2) / tileWidth - 0.5
         readonly property real kXBeginningEnd: 1 / tileWidth + kMiddleIndex / gapToMiddlePhase
         readonly property real maximumItemTranslation: (listView.tileWidth * 3) / listView.scaleFactor
+        readonly property real disabledNewContentX: -carousel.drawBuffer - 1
         readonly property real realContentWidth: contentWidth - 2 * carousel.drawBuffer
         readonly property real realContentX: contentX + carousel.drawBuffer
         readonly property real realPathItemCount: Math.min(realWidth / tileWidth, pathItemCount)
@@ -192,7 +193,7 @@
         onMovementStarted: {
             stepAnimation.stop()
             newContentXAnimation.stop()
-            newContentX = -1
+            newContentX = disabledNewContentX
         }
         onMovementEnded: {
             if (realContentX > 0 && realContentX < realContentWidth - realWidth)
@@ -228,7 +229,7 @@
                 easing.type: Easing.InOutQuad
             }
             ScriptAction {
-                script: listView.newContentX = -1
+                script: listView.newContentX = listView.disabledNewContentX
             }
         }
 
@@ -253,7 +254,7 @@
             readonly property bool explicitScale: (!listView.moving ||
                                                    listView.realContentX <= 0 ||
                                                    listView.realContentX >= listView.realContentWidth - listView.realWidth) &&
-                                                  listView.newContentX < 0 &&
+                                                  listView.newContentX === listView.disabledNewContentX &&
                                                   index === listView.selectedIndex
             readonly property real cachedTiles: listView.realPathItemCount + carousel.drawBuffer / listView.tileWidth
             readonly property real distance: listView.continuousIndex - index