Merge lp:~mzanetti/unity8/fix-super-hides-launcher into lp:unity8

[Michael Zanetti]

Don't hide the launcher on super press if it's locked visible

 * 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
 * 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

[Lukáš Tinkl (lukas-kde)]

Tested, works correctly

* 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

review: Approve

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2892
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3556/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4716
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2868
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2868/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4744
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4567
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4567/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4567
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4567/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4567
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4567/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4567
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4567/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4567
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4567/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4567
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4567/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3556/rebuild

review: Needs Fixing (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

The ^^ zesty failure is due to https://bileto.ubuntu.com/#/ticket/2605 being stuck in proposed

[lp:~mzanetti/unity8/fix-super-hides-launcher]

2893. By Michael Zanetti on 2017-03-28

merge new prereq

Unmerged revisions

=== modified file 'qml/Launcher/Launcher.qml'
--- qml/Launcher/Launcher.qml	2017-03-21 10:54:59 +0000
+++ qml/Launcher/Launcher.qml	2017-03-28 07:57:30 +0000
@@ -75,7 +75,7 @@
         } else {
             superPressTimer.stop();
             superLongPressTimer.stop();
-            switchToNextState("");
+            switchToNextState(root.lockedVisible ? "visible" : "");
             panel.shortcutHintsShown = false;
         }
     }
@@ -88,7 +88,7 @@
             superPressTimer.stop();
             superLongPressTimer.stop();
         } else {
-            switchToNextState("");
+            switchToNextState(root.lockedVisible ? "visible" : "");
             root.focus = false;
             if (panel.highlightIndex == -1) {
                 root.showDashHome();

=== modified file 'qml/Launcher/LauncherPanel.qml'
--- qml/Launcher/LauncherPanel.qml	2017-03-16 10:46:15 +0000
+++ qml/Launcher/LauncherPanel.qml	2017-03-28 07:57:30 +0000
@@ -751,16 +751,18 @@
         Keys.onPressed: {
             switch (event.key) {
             case Qt.Key_Down:
-                selectedIndex++;
-                if (selectedIndex >= popoverRepeater.count) {
-                    selectedIndex = 0;
+                var prevIndex = selectedIndex;
+                selectedIndex = (selectedIndex + 1 < popoverRepeater.count) ? selectedIndex + 1 : 0;
+                while (!popoverRepeater.itemAt(selectedIndex).clickable && selectedIndex != prevIndex) {
+                    selectedIndex = (selectedIndex + 1 < popoverRepeater.count) ? selectedIndex + 1 : 0;
                 }
                 event.accepted = true;
                 break;
             case Qt.Key_Up:
-                selectedIndex--;
-                if (selectedIndex < 0) {
-                    selectedIndex = popoverRepeater.count - 1;
+                var prevIndex = selectedIndex;
+                selectedIndex = (selectedIndex > 0) ? selectedIndex - 1 : popoverRepeater.count - 1;
+                while (!popoverRepeater.itemAt(selectedIndex).clickable && selectedIndex != prevIndex) {
+                    selectedIndex = (selectedIndex > 0) ? selectedIndex - 1 : popoverRepeater.count - 1;
                 }
                 event.accepted = true;
                 break;
@@ -806,6 +808,19 @@
             width: parent.width
             height: quickListColumn.height
 
+            MouseArea {
+                anchors.fill: parent
+                hoverEnabled: true
+                onPositionChanged: {
+                    var item = quickListColumn.childAt(mouseX, mouseY);
+                    if (item.clickable) {
+                        quickList.selectedIndex = item.index;
+                    } else {
+                        quickList.selectedIndex = -1;
+                    }
+                }
+            }
+
             Column {
                 id: quickListColumn
                 width: parent.width
@@ -820,6 +835,9 @@
                     }
 
                     ListItem {
+                        readonly property bool clickable: model.clickable
+                        readonly property int index: model.index
+
                         objectName: "quickListEntry" + index
                         selected: index === quickList.selectedIndex
                         height: label.implicitHeight + label.anchors.topMargin + label.anchors.bottomMargin

=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
--- tests/qmltests/Launcher/tst_Launcher.qml	2017-03-14 10:38:52 +0000
+++ tests/qmltests/Launcher/tst_Launcher.qml	2017-03-28 07:57:30 +0000
@@ -1254,14 +1254,14 @@
             tryCompare(quickList, "selectedIndex", 0)
 
             // Down should move down the quicklist
+            // Because item 1 is not selectable
             keyClick(Qt.Key_Down);
-            tryCompare(quickList, "selectedIndex", 1)
+            tryCompare(quickList, "selectedIndex", 2)
 
             // The quicklist should wrap around too
             keyClick(Qt.Key_Down);
             keyClick(Qt.Key_Down);
             keyClick(Qt.Key_Down);
-            keyClick(Qt.Key_Down);
             tryCompare(quickList, "selectedIndex", 0)
 
             // Left gets us back to the launcher
@@ -1286,14 +1286,14 @@
 
             keyClick(Qt.Key_Down); // Down to launcher item 0
             keyClick(Qt.Key_Down); // Down to launcher item 1
-            keyClick(Qt.Key_Right); // Into quicklist
-            keyClick(Qt.Key_Down); // Down to quicklist item 1
-            keyClick(Qt.Key_Down); // Down to quicklist item 2
+            keyClick(Qt.Key_Right); // Into quicklist, item 0 is selected
+            keyClick(Qt.Key_Down); // Down to quicklist item 2 (because 1 is not selectable)
+            keyClick(Qt.Key_Down); // Down to quicklist item 3
             keyClick(Qt.Key_Enter); // Trigger it
 
             compare(signalSpy.count, 1, "Quicklist signal wasn't triggered")
             compare(signalSpy.signalArguments[0][0], LauncherModel.get(1).appId)
-            compare(signalSpy.signalArguments[0][1], 2)
+            compare(signalSpy.signalArguments[0][1], 3)
             assertFocusOnIndex(-2);
         }
 
@@ -1542,5 +1542,43 @@
             tryCompare(launcher, "maxPanelX", 0);
             launcher.panelWidth = oldSize;
         }
+
+        function test_doesntHideOnSuperWhenLockedVisible() {
+            launcher.lockedVisible = true;
+
+            waitForRendering(launcher);
+            launcher.superPressed = true;
+            wait(400); // Longpress
+            launcher.superPressed = false;
+            waitForRendering(launcher);
+
+            verify(launcher.state, "visible");
+        }
+
+        function test_mouseHoverSelectQuickList() {
+            dragLauncherIntoView();
+            var clickedItem = findChild(launcher, "launcherDelegate5")
+            var quickList = findChild(launcher, "quickList")
+
+            // Initial state
+            tryCompare(quickList, "state", "")
+
+            // Open quickList
+            mouseClick(clickedItem, clickedItem.width / 2, clickedItem.height / 2, Qt.RightButton)
+            verify(quickList, "state", "open")
+            compare(quickList.selectedIndex, -1)
+
+            var qEntry = findChild(launcher, "quickListEntry0");
+            mouseMove(qEntry, qEntry.width / 2    , qEntry.height / 2, 10);
+            mouseMove(qEntry, qEntry.width / 2 + 1, qEntry.height / 2, 10);
+
+            tryCompare(quickList, "selectedIndex", 0)
+
+            qEntry = findChild(launcher, "quickListEntry1");
+            mouseMove(qEntry, qEntry.width / 2    , qEntry.height / 2, 10);
+            mouseMove(qEntry, qEntry.width / 2 + 1, qEntry.height / 2, 10);
+
+            tryCompare(quickList, "selectedIndex", -1)
+        }
     }
 }