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

[Albert Astals Cid]

Block mouse events under scope overview bottombar

 * 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

[Andrea Cimitan (cimi)]

we need a small test on that...

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1206
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~aacid/unity8/clickBlackStuffOverview/+merge/232431/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/4141/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4127
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1142
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1235
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1235
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3959
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5379
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5379/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12219

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

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/clickBlackStuffOverview]

1207. By Albert Astals Cid on 2014-08-28

Merge

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1207
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~aacid/unity8/clickBlackStuffOverview/+merge/232431/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/4153/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4168
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1154
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1247
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1247
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3991
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5420
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5420/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12266

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

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/clickBlackStuffOverview]

1208. By Albert Astals Cid on 2014-08-28

test++

[Albert Astals Cid (aacid)]

> we need a small test on that...

Added.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1208
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~aacid/unity8/clickBlackStuffOverview/+merge/232431/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/4167/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4204
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1168
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1261
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1261
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4017
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5456
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5456/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12303

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

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

* 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.
Issue not on this

review: Approve

=== modified file 'qml/Dash/ScopesOverview.qml'
--- qml/Dash/ScopesOverview.qml	2014-08-27 15:36:18 +0000
+++ qml/Dash/ScopesOverview.qml	2014-08-28 15:51:43 +0000
@@ -386,6 +386,7 @@
 
         Rectangle {
             id: bottomBar
+            objectName: "bottomBar"
             color: "black"
             height: units.gu(8)
             width: parent.width
@@ -400,6 +401,11 @@
                 }
             }
 
+            MouseArea {
+                // Just eat any other press since this parent is black opaque
+                anchors.fill: parent
+            }
+
             AbstractButton {
                 objectName: "scopesOverviewDoneButton"
                 width: Math.max(label.width + units.gu(2), units.gu(10))
 
=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
--- tests/qmltests/Dash/tst_Dash.qml	2014-08-18 11:17:04 +0000
+++ tests/qmltests/Dash/tst_Dash.qml	2014-08-28 15:51:43 +0000
@@ -189,6 +189,14 @@
             var scopesOverviewAllView = findChild(dash, "scopesOverviewRepeaterChild1");
             tryCompare(scopesOverviewAllView, "enabled", true);
 
+            // Click in the middle of the black bar (nothing happens)
+            var bottomBar = findChild(scopesOverview, "bottomBar");
+            mouseClick(bottomBar, bottomBar.width / 2, bottomBar.height / 2);
+            // Check temp scope is not there
+            var scopesOverviewTempScopeItem = findChild(dash, "scopesOverviewTempScopeItem");
+            expectFailContinue("", "Clicking in the middle of bottom bar should not open a temp scope");
+            tryCompareFunction( function() { return scopesOverviewTempScopeItem.scope != null; }, true);
+
             // Click on a temp scope
             var tempScopeCard = findChild(scopesOverviewAllView, "delegate1");
             mouseClick(tempScopeCard, 0, 0);
@@ -198,7 +206,6 @@
             compare(overviewDragHandle.enabled, false);
 
             // Check temp scope is there
-            var scopesOverviewTempScopeItem = findChild(dash, "scopesOverviewTempScopeItem");
             tryCompareFunction( function() { return scopesOverviewTempScopeItem.scope != null; }, true);
             tryCompare(scopesOverviewTempScopeItem, "enabled", true);