Merge lp:~mzanetti/unity8/hide-quicklist-on-launcher-hide into lp:unity8

[Michael Zanetti]

hide quicklist when launcher hides

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

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

[Albert Astals Cid (aacid)]

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

* Did CI run pass?
Waiting before top approval

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

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1432
http://jenkins.qa.ubuntu.com/job/unity8-ci/4866/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/84
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/81
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/84
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/84/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15620

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

review: Approve (continuous-integration)

=== modified file 'qml/Launcher/LauncherPanel.qml'
--- qml/Launcher/LauncherPanel.qml	2014-11-04 12:52:02 +0000
+++ qml/Launcher/LauncherPanel.qml	2014-11-10 10:17:21 +0000
@@ -38,6 +38,12 @@
     signal applicationSelected(string appId)
     signal showDashHome()
 
+    onXChanged: {
+        if (quickList.state == "open") {
+            quickList.state = ""
+        }
+    }
+
     Column {
         id: mainColumn
         anchors {

=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
--- tests/qmltests/Launcher/tst_Launcher.qml	2014-11-04 12:54:03 +0000
+++ tests/qmltests/Launcher/tst_Launcher.qml	2014-11-10 10:17:21 +0000
@@ -519,5 +519,23 @@
                 tryCompare(quickListShape, "visible", false)
             }
         }
+
+        function test_quicklistHideOnLauncherHide() {
+            dragLauncherIntoView();
+            var clickedItem = findChild(launcher, "launcherDelegate5")
+            var quickList = findChild(launcher, "quickList")
+
+            // Initial state
+            tryCompare(quickList, "state", "")
+
+            // Doing longpress
+            mousePress(clickedItem, clickedItem.width / 2, clickedItem.height / 2)
+            tryCompare(clickedItem, "itemOpacity", 0) // Wait for longpress to happen
+            verify(quickList, "state", "open")
+
+            launcher.hide();
+
+            tryCompare(quickList, "state", "");
+        }
     }
 }