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

[Albert Astals Cid]

Dash Departments fixes

Update maxHeight manually since it depends on the position of the item and its parents and it can't know when the binding has to be updated
Make parent stuff non interactive when the department list is shown

* 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?
This is a change requested by design

[lp:~aacid/unity8/dashSepartmentsListTweaks]

1082. By Albert Astals Cid on 2014-07-25

We are vertical flickable

1083. By Albert Astals Cid on 2014-07-25

Merge

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1082
http://jenkins.qa.ubuntu.com/job/unity8-ci/3602/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2506
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/604
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/696
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/696
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/696/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/696
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2658
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3749
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3749/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10435

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1083
http://jenkins.qa.ubuntu.com/job/unity8-ci/3613/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2530
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/615
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/707
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/707
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/707/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/707
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2677
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3773
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3773/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10468

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

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/dashSepartmentsListTweaks]

1084. By Albert Astals Cid on 2014-07-28

merge

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1083
http://jenkins.qa.ubuntu.com/job/unity8-ci/3623/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2549
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/625
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/717
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/717
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/717/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/717
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2695
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3792
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3792/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10492

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1084
http://jenkins.qa.ubuntu.com/job/unity8-ci/3636/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2563
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/638
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/730
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/730
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/730/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/730
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2707
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3806
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3806/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10509

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

review: Approve (continuous-integration)

[lp:~aacid/unity8/dashSepartmentsListTweaks]

1085. By Albert Astals Cid on 2014-07-30

Merge

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1085
http://jenkins.qa.ubuntu.com/job/unity8-ci/3671/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2697
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/673
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/765
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/765
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/765/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/765
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2808
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3940
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3940/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10658

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

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/dashSepartmentsListTweaks]

1086. By Albert Astals Cid on 2014-08-01

merge

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1086
http://jenkins.qa.ubuntu.com/job/unity8-ci/3727/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2889
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/729
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/821
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/821
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/821/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/821
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2957
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4132
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4132/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10833

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

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

LGTM

 * Did you perform an exploratory manual test run of the code change and any related functionality?
 - Yes. Can no longer swipe left or right to change scopes while the department list is up. And the list is a constant height.

 * Did CI run pass? If not, please explain why.
 - No, some qmluitests failed. The dash content one worked locally... Albert, do you suspect that's just a blip?

review: Needs Information

[Albert Astals Cid (aacid)]

> * Did CI run pass? If not, please explain why.
> - No, some qmluitests failed. The dash content one worked locally...
> Albert, do you suspect that's just a blip?

testDash and testDashContent segfault randomly, if you loop them in your computer it should also happen (happens here), both with and without this patch, needs checking.

[Michael Terry (mterry)]

OK approved, thanks Albert!

review: Approve

[lp:~aacid/unity8/dashSepartmentsListTweaks]

1087. By Albert Astals Cid on 2014-08-05

Merge

=== modified file 'qml/Dash/DashContent.qml'
--- qml/Dash/DashContent.qml	2014-07-24 23:31:44 +0000
+++ qml/Dash/DashContent.qml	2014-08-05 18:01:29 +0000
@@ -89,7 +89,7 @@
             id: dashContentList
             objectName: "dashContentList"
 
-            interactive: dashContent.scopes.loaded && currentItem && !currentItem.moving
+            interactive: dashContent.scopes.loaded && currentItem && !currentItem.moving && !currentItem.departmentsShown
 
             anchors.fill: parent
             model: dashContent.model
@@ -130,6 +130,7 @@
                     objectName: scope.id + " loader"
 
                     readonly property bool moving: item ? item.moving : false
+                    readonly property bool departmentsShown: item ? item.departmentsShown : false
                     readonly property var categoryView: item ? item.categoryView : null
                     readonly property var theScope: scope
 

=== modified file 'qml/Dash/DashDepartments.qml'
--- qml/Dash/DashDepartments.qml	2014-07-08 11:08:19 +0000
+++ qml/Dash/DashDepartments.qml	2014-08-05 18:01:29 +0000
@@ -39,6 +39,7 @@
     height: visible ? units.gu(5) : 0
 
     onClicked: {
+        departmentListView.updateMaxHeight();
         root.showList = !root.showList;
     }
 
@@ -111,7 +112,12 @@
             right: parent.right
             top: root.bottom
         }
-        readonly property int maxHeight: (windowHeight - mapToItem(null, root.x, root.y).y) - units.gu(8)
+        property int maxHeight: -1
+        Component.onCompleted: updateMaxHeight();
+        function updateMaxHeight()
+        {
+            maxHeight = (windowHeight - mapToItem(null, 0, 0).y) - units.gu(8);
+        }
         property int prevHeight: maxHeight
         height: currentItem ? currentItem.height : maxHeight
         onHeightChanged: {
@@ -129,6 +135,7 @@
                 if (root.showList) {
                     if (department && department.loaded && x == departmentListView.contentX)
                     {
+                        departmentListView.updateMaxHeight();
                         return Math.min(implicitHeight, departmentListView.maxHeight);
                     } else {
                         return departmentListView.prevHeight;

=== modified file 'qml/Dash/DashDepartmentsList.qml'
--- qml/Dash/DashDepartmentsList.qml	2014-07-08 11:08:19 +0000
+++ qml/Dash/DashDepartmentsList.qml	2014-08-05 18:01:29 +0000
@@ -54,6 +54,7 @@
 
         anchors.fill: parent
 
+        flickableDirection: Flickable.VerticalFlick
         contentHeight: column.height
         contentWidth: width
 

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2014-07-29 11:35:10 +0000
+++ qml/Dash/GenericScopeView.qml	2014-08-05 18:01:29 +0000
@@ -25,6 +25,7 @@
 FocusScope {
     id: scopeView
 
+    readonly property alias departmentsShown: dashDepartments.showList
     property var scope: null
     property SortFilterProxyModel categories: categoryFilter
     property bool isCurrent: false
@@ -119,6 +120,7 @@
         model: scopeView.categories
         forceNoClip: previewListView.open
         pixelAligned: true
+        interactive: !dashDepartments.showList
 
         property string expandedCategoryId: ""
 
@@ -391,6 +393,7 @@
             scopeStyle: scopeView.scopeStyle
 
             bottomItem: DashDepartments {
+                id: dashDepartments
                 scope: scopeView.scope
                 width: parent.width <= units.gu(60) ? parent.width : units.gu(40)
                 anchors.right: parent.right