Merge lp:~mzanetti/unity8/quit-from-switcher into lp:unity8

[Michael Zanetti]

Add support for closing apps from the spread with "Q"

 * Are there any related MPs required for this MP to build/function as expected? Please list.
np
 * 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

[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? If not, please explain why.
Waiting

review: Approve

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

PASSED: Continuous integration, rev:2841
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3318/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4368
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2614
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2614
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4396
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4229
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4229/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4229
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4229/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4229
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4229/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4229
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4229/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4229
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4229/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4229
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4229/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'qml/Stage/Spread/Spread.qml'
--- qml/Stage/Spread/Spread.qml	2016-11-07 12:37:56 +0000
+++ qml/Stage/Spread/Spread.qml	2017-03-09 09:44:27 +0000
@@ -40,6 +40,7 @@
     property real rightEdgeBreakPoint: Math.min(units.gu(40) / root.width, .35)
 
     signal leaveSpread()
+    signal closeCurrentApp();
 
     // Calculated stuff
     readonly property int totalItemCount: model.count
@@ -118,6 +119,13 @@
         Behavior on opacity { UbuntuNumberAnimation { } }
     }
 
+    readonly property int itemCount: root.model.count
+    onItemCountChanged: {
+        if (highlightedIndex >= itemCount) {
+            highlightedIndex = itemCount - 1
+        }
+    }
+
     Keys.onPressed: {
         switch (event.key) {
         case Qt.Key_Left:
@@ -130,6 +138,9 @@
             selectNext(event.isAutoRepeat)
             event.accepted = true;
             break;
+        case Qt.Key_Q:
+            closeCurrentApp();
+            break;
         case Qt.Key_Escape:
             highlightedIndex = -1
             // Falling through intentionally

=== modified file 'qml/Stage/Stage.qml'
--- qml/Stage/Stage.qml	2017-02-16 13:44:45 +0000
+++ qml/Stage/Stage.qml	2017-03-09 09:44:27 +0000
@@ -575,6 +575,12 @@
             onLeaveSpread: {
                 priv.goneToSpread = false;
             }
+
+            onCloseCurrentApp: {
+                if (!appRepeater.itemAt(highlightedIndex).isDash) {
+                    appRepeater.itemAt(highlightedIndex).close();
+                }
+            }
         }
 
         Connections {

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2017-02-16 13:46:11 +0000
+++ tests/qmltests/tst_Shell.qml	2017-03-09 09:44:27 +0000
@@ -2883,6 +2883,86 @@
             tryCompare(appDelegate, "state", "maximizedRight");
         }
 
+
+        function test_closeAppsInSpreadWithQ() {
+            loadShell("desktop");
+            shell.usageScenario = "desktop";
+            waitForRendering(shell);
+            swipeAwayGreeter();
+
+            var appSurfaceId = topLevelSurfaceList.nextId;
+            var app = ApplicationManager.startApplication("dialer-app")
+            waitUntilAppWindowIsFullyLoaded(appSurfaceId);
+
+            appSurfaceId = topLevelSurfaceList.nextId;
+            app = ApplicationManager.startApplication("calendar-app")
+            waitUntilAppWindowIsFullyLoaded(appSurfaceId);
+
+            keyPress(Qt.Key_Alt);
+            keyClick(Qt.Key_Tab);
+
+            var stage = findChild(shell, "stage");
+            var spread = findChild(stage, "spreadItem");
+            var appRepeater = findChild(stage, "appRepeater");
+
+            tryCompare(stage, "state", "spread");
+
+            tryCompare(ApplicationManager, "count", 3);
+            tryCompareFunction(function() {return appRepeater.itemAt(spread.highlightedIndex).appId == "dialer-app"}, true);
+
+            // Close one app with Q while in spread
+            keyClick(Qt.Key_Q);
+
+            tryCompare(ApplicationManager, "count", 2);
+
+            // Now the dash should be highlighted
+            tryCompareFunction(function() {return appRepeater.itemAt(spread.highlightedIndex).appId == "unity8-dash"}, true);
+
+            keyClick(Qt.Key_Q);
+
+            // Dash is not closeable, should still be 2
+            tryCompare(ApplicationManager, "count", 2);
+
+            // Move to the next one, should be closable again
+            keyClick(Qt.Key_Tab);
+            tryCompareFunction(function() {return appRepeater.itemAt(spread.highlightedIndex).appId == "calendar-app"}, true);
+
+            // close it
+            keyClick(Qt.Key_Q);
+            tryCompare(ApplicationManager, "count", 1);
+
+            keyRelease(Qt.Key_Alt);
+
+            // Now start the apps again
+            appSurfaceId = topLevelSurfaceList.nextId;
+            app = ApplicationManager.startApplication("dialer-app");
+            waitUntilAppWindowIsFullyLoaded(appSurfaceId);
+
+            appSurfaceId = topLevelSurfaceList.nextId;
+            app = ApplicationManager.startApplication("calendar-app");
+            waitUntilAppWindowIsFullyLoaded(appSurfaceId);
+
+            // First focus the dash so it'll be the leftmost in the spread
+            ApplicationManager.requestFocusApplication("unity8-dash");
+
+            keyPress(Qt.Key_Alt);
+            keyClick(Qt.Key_Tab);
+            tryCompare(stage, "state", "spread");
+
+            // Move to the last one
+            keyClick(Qt.Key_Tab);
+
+            // Close the last one, make sure the highlight fixes itself to stick within the list
+            tryCompare(spread, "highlightedIndex", ApplicationManager.count - 1);
+            var oldHighlighted = spread.highlightedIndex;
+
+            keyClick(Qt.Key_Q);
+            tryCompare(spread, "highlightedIndex", oldHighlighted - 1);
+
+            keyRelease(Qt.Key_Alt);
+
+        }
+
         function test_altTabToMinimizedApp() {
             loadShell("desktop");
             shell.usageScenario = "desktop";