Merge lp:~mzanetti/unity8/close-temp-scope-on-left-edge into lp:unity8

[Michael Zanetti]

close previews and temp scopes on left edge/BFB

 * 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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1434
http://jenkins.qa.ubuntu.com/job/unity8-ci/4887/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/166
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/52
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/157
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/166
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/166/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15755

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1434
http://jenkins.qa.ubuntu.com/job/unity8-ci/4910/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/228
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/87
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/75
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/75
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/204
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/228
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/228/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15874

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

review: Approve (continuous-integration)

[Andrea Cimitan (cimi)]

It does what it says

 * 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.
it did!
 * Did you make sure that the branch does not contain spurious tags?
yes

review: Approve

=== modified file 'qml/Dash/Dash.qml'
--- qml/Dash/Dash.qml	2014-11-04 12:52:02 +0000
+++ qml/Dash/Dash.qml	2014-11-12 14:37:41 +0000
@@ -31,9 +31,10 @@
     DashCommunicatorService {
         objectName: "dashCommunicatorService"
         onSetCurrentScopeRequested: {
-            if (!isSwipe || !window.active || overviewController.progress != 0) {
+            if (!isSwipe || !window.active || overviewController.progress != 0 || scopeItem.scope || dashContent.subPageShown) {
                 if (overviewController.progress != 0 && window.active) animate = false;
                 dashContent.setCurrentScopeAtIndex(index, animate, isSwipe)
+                // Close dash overview and nested temp scopes in it
                 if (overviewController.progress != 0) {
                     if (window.active) {
                         dashContentCache.scheduleUpdate();
@@ -42,6 +43,14 @@
                     overviewController.progress = 0;
                     scopesOverview.closeTempScope();
                 }
+                // Close normal temp scopes (e.g. App Store)
+                if (scopeItem.scope) {
+                    scopeItem.backClicked();
+                }
+                // Close previews
+                if (dashContent.subPageShown) {
+                    dashContent.closePreview();
+                }
             }
         }
     }
@@ -389,5 +398,4 @@
             }
         }
     }
-
 }
 
=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
--- tests/qmltests/Dash/tst_Dash.qml	2014-10-30 14:55:29 +0000
+++ tests/qmltests/Dash/tst_Dash.qml	2014-11-12 14:37:41 +0000
@@ -298,6 +298,22 @@
             tryCompare(dashContentList, "currentIndex", 1)
         }
 
+        function test_setCurrentScopeClosesPreview() {
+            var dashContent = findChild(dash, "dashContent");
+            waitForRendering(dash)
+
+            var delegate0 = findChild(dash, "delegate0");
+            mouseClick(delegate0, delegate0.width / 2, delegate0.height / 2);
+
+            tryCompare(dashContent, "subPageShown", true)
+            waitForRendering(dash);
+
+            var dashCommunicatorService = findInvisibleChild(dash, "dashCommunicatorService");
+            dashCommunicatorService.mockSetCurrentScope(0, true, false);
+
+            tryCompare(dashContent, "subPageShown", false)
+        }
+
         function test_processing_indicator() {
             var processingIndicator = findChild(dash, "processingIndicator");
             verify(processingIndicator, "Can't find the processing indicator.");