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

[Albert Astals Cid]

Make sure the triangle of the quicklist is in bounds

 * 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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2104
http://jenkins.qa.ubuntu.com/job/unity8-ci/7028/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5966
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/443/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1733
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/436
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1628
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1628
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/435
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/434
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4611
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5977
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5977/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26480
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/195/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/441
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/441/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26481

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

As you weren't sure if this fix is the best approach and asked for my opinion, I played around a bit and found something much simpler and actually better (now it sticks to the item's center inatead of only staying within the bounds).

See superseding mp.

Unmerged revisions

2104. By Albert Astals Cid on 2016-01-07

Make sure the triangle of the quicklist is in bounds

=== modified file 'qml/Launcher/LauncherPanel.qml'
--- qml/Launcher/LauncherPanel.qml	2015-12-03 10:18:14 +0000
+++ qml/Launcher/LauncherPanel.qml	2016-01-07 14:43:03 +0000
@@ -58,6 +58,7 @@
         }
 
         Item {
+            id: buttonShowDashHome
             objectName: "buttonShowDashHome"
             width: parent.width
             height: units.gu(7)
@@ -628,7 +629,27 @@
                 right: parent.left
                 rightMargin: -units.dp(4)
                 verticalCenter: parent.verticalCenter
-                verticalCenterOffset: -quickList.offset * (root.inverted ? -1 : 1)
+                verticalCenterOffset: {
+                    var offset;
+                    var maxOffset = (parent.height - height) / 2 - units.gu(2);
+
+                    // make sure the quicklist triangle is inside the quicklist itself
+                    if (Math.abs(quickList.offset) < maxOffset) {
+                        offset = quickList.offset;
+                    } else if (quickList.offset < 0) {
+                        offset = -maxOffset;
+                    } else {
+                        offset = maxOffset;
+                    }
+
+                    // Also make sure it's not over the Ubuntu icon
+                    // that is valid space for the quicklist itself but not for the marker
+                    if (quickList.y + quickList.height / 2 - offset < buttonShowDashHome.height + units.gu(2)) {
+                        offset = quickList.y + quickList.height / 2 - buttonShowDashHome.height - units.gu(2);
+                    }
+
+                    return -offset * (root.inverted ? -1 : 1)
+                }
             }
             height: units.gu(1)
             width: units.gu(2)