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

[Albert Astals Cid]

Make the PreviewButtons be of the width of the button and not half the total width

half the total width is still the max width and the combos are still all the same width

 * 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

 * 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

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

FAILED: Continuous integration, rev:2656
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2333/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3071
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1717
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1717
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1717
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3099
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2956
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2956/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2956
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2956/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2956
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2956/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2956
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2956/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2956
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2956/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2956
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2956/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2956
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2956/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2956
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2956/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2956
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2956/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

Code is fine, failures (I retriggered) shouldn't be related

 * Did you perform an exploratory manual test run of the code change and any related functionality?
y
 * Did CI run pass? If not, please explain why.
not related

review: Approve

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

PASSED: Continuous integration, rev:2656
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2341/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3081
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1727
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1727
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1727
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3109
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2966
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2966/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2966
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2966/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2966
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2966/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2966
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2966/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2966
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2966/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2966
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2966/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2966
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2966/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2966
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2966/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2966
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2966/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Andrea Cimitan (cimi)]

I noticed that the buttons in the dash appear to have outer shadow - can we at least make them flat and remove the inset? aspect: UbuntuShape.Flat

review: Needs Fixing

[Albert Astals Cid (aacid)]

The button doesn't really have an aspect, so that's hard to achieve with the current Ubuntu.Button component being used.

[Andrea Cimitan (cimi)]

We agreed to leave it this way until sdk adds different capability to the button component

review: Approve

[lp:~aacid/unity8/previewButtonsDifferentWidth]

2657. By Albert Astals Cid on 2016-11-02

Design wants more spacing

IMHO this should be part of the SDK button implicitWidth already, but oh well

=== modified file 'qml/Dash/Previews/PreviewActionCombo.qml'
--- qml/Dash/Previews/PreviewActionCombo.qml	2016-04-01 13:20:27 +0000
+++ qml/Dash/Previews/PreviewActionCombo.qml	2016-11-02 16:47:23 +0000
@@ -21,6 +21,7 @@
     id: root
 
     implicitHeight: childrenRect.height
+    implicitWidth: Math.max(moreButton.implicitWidth, column.maxButtonImplicitWidth)
 
     signal triggeredAction(var actionData)
 
@@ -39,14 +40,23 @@
     }
 
     Column {
+        id: column
         anchors {
             top: moreButton.bottom
             topMargin: height > 0 ? spacing : 0
         }
         objectName: "buttonColumn"
         spacing: units.gu(1)
-        width: parent.width
         height: moreButton.expanded ? implicitHeight : 0
+
+        property real maxButtonImplicitWidth: 0
+        function calculateImplicitWidth() {
+            maxButtonImplicitWidth = 0;
+            for (var i in children) {
+                maxButtonImplicitWidth = Math.max(maxButtonImplicitWidth, children[i].implicitWidth);
+            }
+        }
+
         clip: true
         Behavior on height {
             UbuntuNumberAnimation {
@@ -59,7 +69,8 @@
 
             delegate: PreviewActionButton {
                 data: modelData
-                width: implicitWidth < root.width ? root.width : implicitWidth
+                width: root.width
+                onImplicitWidthChanged: column.calculateImplicitWidth();
                 onClicked: root.triggeredAction(modelData)
                 strokeColor: moreButton.strokeColor
             }

=== modified file 'qml/Dash/Previews/PreviewActions.qml'
--- qml/Dash/Previews/PreviewActions.qml	2016-05-27 13:52:27 +0000
+++ qml/Dash/Previews/PreviewActions.qml	2016-11-02 16:47:23 +0000
@@ -27,6 +27,7 @@
 
     implicitHeight: row.height + units.gu(1)
     readonly property var actions: root.widgetData ? root.widgetData["actions"] : null
+    readonly property real maxButtonWidth: (width - units.gu(1)) / 2
 
     Row {
         id: row
@@ -40,7 +41,7 @@
             readonly property bool button: root.actions && root.actions.length == 2
             readonly property bool combo: root.actions && root.actions.length > 2
             source: button ? "PreviewActionButton.qml" : (combo ? "PreviewActionCombo.qml" : "")
-            width: (root.width - units.gu(1)) / 2
+            width: Math.min(root.maxButtonWidth, implicitWidth + units.gu(2))
             onLoaded: {
                 if (button) {
                     item.data = Qt.binding(function() { return root.actions[1]; });
@@ -65,7 +66,7 @@
             data: visible ? root.actions[0] : null
             visible: root.actions && root.actions.length > 0
             onTriggeredAction: root.triggered(root.widgetId, actionData.id, actionData)
-            width: (root.width - units.gu(1)) / 2
+            width: Math.min(root.maxButtonWidth, implicitWidth + units.gu(2))
             color: root.scopeStyle ? root.scopeStyle.previewButtonColor : theme.palette.normal.positive
         }
     }

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewActions.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewActions.qml	2016-08-23 12:45:36 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewActions.qml	2016-11-02 16:47:23 +0000
@@ -39,9 +39,27 @@
     readonly property var actionDataFiveActions: {
         "actions": [{"label": "Some Label C", "id": "someid3"},
                     {"label": "Some Label D", "id": "someid4"},
-                    {"label": "Some Label E", "id": "someid5"},
-                    {"label": "Some Label F", "id": "someid6"},
-                    {"label": "Some Label G", "id": "someid7"}
+                    {"label": "Some Longer Longer Longer Longer Label E", "id": "someid5"},
+                    {"label": "Some Label F", "id": "someid6"},
+                    {"label": "Some Label G", "id": "someid7"}
+        ]
+    }
+
+    readonly property var actionDataFiveActions2: {
+        "actions": [{"label": "Some Label C", "id": "someid3"},
+                    {"label": "Some Label D", "id": "someid4"},
+                    {"label": "Some E", "id": "someid5"},
+                    {"label": "Some Label F", "id": "someid6"},
+                    {"label": "Some Label G", "id": "someid7"}
+        ]
+    }
+
+    readonly property var actionDataFiveActions3: {
+        "actions": [{"label": "C", "id": "someid3"},
+                    {"label": "D", "id": "someid4"},
+                    {"label": "E", "id": "someid5"},
+                    {"label": "F", "id": "someid6"},
+                    {"label": "G", "id": "someid7"}
         ]
     }
 
@@ -91,6 +109,18 @@
         }
 
         PreviewActions {
+            id: buttonAndCombo2
+            widgetData: actionDataFiveActions2
+            width: units.gu(40)
+        }
+
+        PreviewActions {
+            id: buttonAndCombo3
+            widgetData: actionDataFiveActions3
+            width: units.gu(40)
+        }
+
+        PreviewActions {
             id: twoActions
             widgetId: "2buttons"
             widgetData: actionDataTwoActions