Merge lp:~mzanetti/unity8/launcher-initial-extensionSize into lp:unity8

[Michael Zanetti]

setting the launcher's extensionSize delayed to position the view correctly at the beginning

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:262
http://jenkins.qa.ubuntu.com/job/unity8-ci/804/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2706
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/331
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1393
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/805
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/805/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/804
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2712
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2712/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2297
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/333
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/333/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/298
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/305

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

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/unity8/launcher-initial-extensionSize]

263. By Michael Zanetti on 2013-08-28

enable test for this issue again and add a more detailed comment

[Albert Astals Cid (aacid)]

Looks good

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:263
http://jenkins.qa.ubuntu.com/job/unity8-ci/807/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2717
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/338
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1400
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/808
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/808/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/807
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2723
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2723/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2306
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/340
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/340/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/305
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/312

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

review: Approve (continuous-integration)

=== modified file 'Launcher/LauncherPanel.qml'
--- Launcher/LauncherPanel.qml	2013-08-27 06:59:04 +0000
+++ Launcher/LauncherPanel.qml	2013-08-28 10:43:18 +0000
@@ -110,7 +110,20 @@
                     // destroyed when dragging them outside the list. This needs to be at least
                     // itemHeight to prevent folded items from disappearing and DragArea limits
                     // need to be smaller than this size to avoid breakage.
-                    property int extensionSize: itemHeight * 3
+                    property int extensionSize: 0
+
+                    // Setting extensionSize after the list has been populated because it has
+                    // the potential to mess up with the intial positioning in combination
+                    // with snapping to the center of the list. This catches all the cases
+                    // where the item would be outside the list for more than itemHeight / 2.
+                    // For the rest, give it a flick to scroll to the beginning. Note that
+                    // the flicking alone isn't enough because in some cases it's not strong
+                    // enough to overcome the snapping.
+                    // https://bugreports.qt-project.org/browse/QTBUG-32251
+                    Component.onCompleted: {
+                        extensionSize = itemHeight * 3
+                        flick(0, clickFlickSpeed)
+                    }
 
                     // The height of the area where icons start getting folded
                     property int foldingStartHeight: units.gu(6.5)

=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
--- tests/qmltests/Launcher/tst_Launcher.qml	2013-08-23 16:19:10 +0000
+++ tests/qmltests/Launcher/tst_Launcher.qml	2013-08-28 10:43:18 +0000
@@ -249,11 +249,10 @@
         name: "LauncherInit"
         when: windowShown
 
-        /*
-         * FIXME: There is a bug in ListView which makes it snap to an item
-         * instead of the edge at startup. Enable this test once our patch for
-         * ListView has landed upstream.
-         * https://bugreports.qt-project.org/browse/QTBUG-32251
+        function initTestCase() {
+            var listView = findChild(launcher, "launcherListView");
+            tryCompare(listView, "flicking", false)
+        }
 
         function test_initFirstUnfolded() {
 
@@ -267,7 +266,6 @@
             // Now do check that snapping is in fact enabled
             compare(listView.snapMode, ListView.SnapToItem, "Snapping is not enabled");
         }
-        */
     }
 
     UT.UnityTestCase {