1
=== modified file 'qml/Dash/Previews/PreviewActionCombo.qml'
2
--- qml/Dash/Previews/PreviewActionCombo.qml	2016-04-01 13:20:27 +0000
3
+++ qml/Dash/Previews/PreviewActionCombo.qml	2016-11-02 16:47:23 +0000
4
@@ -21,6 +21,7 @@
5
21
    id: root
21
    id: root
6
22
22
7
23
    implicitHeight: childrenRect.height
23
    implicitHeight: childrenRect.height
8
24
    implicitWidth: Math.max(moreButton.implicitWidth, column.maxButtonImplicitWidth)
9
24
25
10
25
    signal triggeredAction(var actionData)
26
    signal triggeredAction(var actionData)
11
26
27
12
@@ -39,14 +40,23 @@
13
39
    }
40
    }
14
40
41
15
41
    Column {
42
    Column {
16
43
        id: column
17
42
        anchors {
44
        anchors {
18
43
            top: moreButton.bottom
45
            top: moreButton.bottom
19
44
            topMargin: height > 0 ? spacing : 0
46
            topMargin: height > 0 ? spacing : 0
20
45
        }
47
        }
21
46
        objectName: "buttonColumn"
48
        objectName: "buttonColumn"
22
47
        spacing: units.gu(1)
49
        spacing: units.gu(1)
23
48
        width: parent.width
24
49
        height: moreButton.expanded ? implicitHeight : 0
50
        height: moreButton.expanded ? implicitHeight : 0
25
51
26
52
        property real maxButtonImplicitWidth: 0
27
53
        function calculateImplicitWidth() {
28
54
            maxButtonImplicitWidth = 0;
29
55
            for (var i in children) {
30
56
                maxButtonImplicitWidth = Math.max(maxButtonImplicitWidth, children[i].implicitWidth);
31
57
            }
32
58
        }
33
59
34
50
        clip: true
60
        clip: true
35
51
        Behavior on height {
61
        Behavior on height {
36
52
            UbuntuNumberAnimation {
62
            UbuntuNumberAnimation {
37
@@ -59,7 +69,8 @@
38
59
69
39
60
            delegate: PreviewActionButton {
70
            delegate: PreviewActionButton {
40
61
                data: modelData
71
                data: modelData
42
62
                width: implicitWidth < root.width ? root.width : implicitWidth
72
                width: root.width
43
73
                onImplicitWidthChanged: column.calculateImplicitWidth();
44
63
                onClicked: root.triggeredAction(modelData)
74
                onClicked: root.triggeredAction(modelData)
45
64
                strokeColor: moreButton.strokeColor
75
                strokeColor: moreButton.strokeColor
46
65
            }
76
            }
47
66
77
48
=== modified file 'qml/Dash/Previews/PreviewActions.qml'
49
--- qml/Dash/Previews/PreviewActions.qml	2016-05-27 13:52:27 +0000
50
+++ qml/Dash/Previews/PreviewActions.qml	2016-11-02 16:47:23 +0000
51
@@ -27,6 +27,7 @@
52
27
27
53
28
    implicitHeight: row.height + units.gu(1)
28
    implicitHeight: row.height + units.gu(1)
54
29
    readonly property var actions: root.widgetData ? root.widgetData["actions"] : null
29
    readonly property var actions: root.widgetData ? root.widgetData["actions"] : null
55
30
    readonly property real maxButtonWidth: (width - units.gu(1)) / 2
56
30
31
57
31
    Row {
32
    Row {
58
32
        id: row
33
        id: row
59
@@ -40,7 +41,7 @@
60
40
            readonly property bool button: root.actions && root.actions.length == 2
41
            readonly property bool button: root.actions && root.actions.length == 2
61
41
            readonly property bool combo: root.actions && root.actions.length > 2
42
            readonly property bool combo: root.actions && root.actions.length > 2
62
42
            source: button ? "PreviewActionButton.qml" : (combo ? "PreviewActionCombo.qml" : "")
43
            source: button ? "PreviewActionButton.qml" : (combo ? "PreviewActionCombo.qml" : "")
64
43
            width: (root.width - units.gu(1)) / 2
44
            width: Math.min(root.maxButtonWidth, implicitWidth + units.gu(2))
65
44
            onLoaded: {
45
            onLoaded: {
66
45
                if (button) {
46
                if (button) {
67
46
                    item.data = Qt.binding(function() { return root.actions[1]; });
47
                    item.data = Qt.binding(function() { return root.actions[1]; });
68
@@ -65,7 +66,7 @@
69
65
            data: visible ? root.actions[0] : null
66
            data: visible ? root.actions[0] : null
70
66
            visible: root.actions && root.actions.length > 0
67
            visible: root.actions && root.actions.length > 0
71
67
            onTriggeredAction: root.triggered(root.widgetId, actionData.id, actionData)
68
            onTriggeredAction: root.triggered(root.widgetId, actionData.id, actionData)
73
68
            width: (root.width - units.gu(1)) / 2
69
            width: Math.min(root.maxButtonWidth, implicitWidth + units.gu(2))
74
69
            color: root.scopeStyle ? root.scopeStyle.previewButtonColor : theme.palette.normal.positive
70
            color: root.scopeStyle ? root.scopeStyle.previewButtonColor : theme.palette.normal.positive
75
70
        }
71
        }
76
71
    }
72
    }
77
72
73
78
=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewActions.qml'
79
--- tests/qmltests/Dash/Previews/tst_PreviewActions.qml	2016-08-23 12:45:36 +0000
80
+++ tests/qmltests/Dash/Previews/tst_PreviewActions.qml	2016-11-02 16:47:23 +0000
81
@@ -39,9 +39,27 @@
82
39
    readonly property var actionDataFiveActions: {
39
    readonly property var actionDataFiveActions: {
83
40
        "actions": [{"label": "Some Label C", "id": "someid3"},
40
        "actions": [{"label": "Some Label C", "id": "someid3"},
84
41
                    {"label": "Some Label D", "id": "someid4"},
41
                    {"label": "Some Label D", "id": "someid4"},
88
42
                    {"label": "Some Label E", "id": "someid5"},
42
                    {"label": "Some Longer Longer Longer Longer Label E", "id": "someid5"},
89
43
                    {"label": "Some Label F", "id": "someid6"},
43
                    {"label": "Some Label F", "id": "someid6"},
90
44
                    {"label": "Some Label G", "id": "someid7"}
44
                    {"label": "Some Label G", "id": "someid7"}
91
45
        ]
92
46
    }
93
47
94
48
    readonly property var actionDataFiveActions2: {
95
49
        "actions": [{"label": "Some Label C", "id": "someid3"},
96
50
                    {"label": "Some Label D", "id": "someid4"},
97
51
                    {"label": "Some E", "id": "someid5"},
98
52
                    {"label": "Some Label F", "id": "someid6"},
99
53
                    {"label": "Some Label G", "id": "someid7"}
100
54
        ]
101
55
    }
102
56
103
57
    readonly property var actionDataFiveActions3: {
104
58
        "actions": [{"label": "C", "id": "someid3"},
105
59
                    {"label": "D", "id": "someid4"},
106
60
                    {"label": "E", "id": "someid5"},
107
61
                    {"label": "F", "id": "someid6"},
108
62
                    {"label": "G", "id": "someid7"}
109
45
        ]
63
        ]
110
46
    }
64
    }
111
47
65
112
@@ -91,6 +109,18 @@
113
91
        }
109
        }
114
92
110
115
93
        PreviewActions {
111
        PreviewActions {
116
112
            id: buttonAndCombo2
117
113
            widgetData: actionDataFiveActions2
118
114
            width: units.gu(40)
119
115
        }
120
116
121
117
        PreviewActions {
122
118
            id: buttonAndCombo3
123
119
            widgetData: actionDataFiveActions3
124
120
            width: units.gu(40)
125
121
        }
126
122
127
123
        PreviewActions {
128
94
            id: twoActions
124
            id: twoActions
129
95
            widgetId: "2buttons"
125
            widgetId: "2buttons"
130
96
            widgetData: actionDataTwoActions
126
            widgetData: actionDataTwoActions
Status:	Merged
Approved by:	Andrea Cimitan on 2016-10-17
Approved revision:	2656
Merged at revision:	2681
Proposed branch:	lp:~aacid/unity8/previewButtonsDifferentWidth
Merge into:	lp:unity8
Diff against target:	130 lines (+49/-7) 3 files modified qml/Dash/Previews/PreviewActionCombo.qml (+13/-2) qml/Dash/Previews/PreviewActions.qml (+3/-2) tests/qmltests/Dash/Previews/tst_PreviewActions.qml (+33/-3)
To merge this branch:	bzr merge lp:~aacid/unity8/previewButtonsDifferentWidth
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Andrea Cimitan (community)		2016-10-06	Approve on 2016-10-17
Unity8 CI Bot	continuous-integration		Approve on 2016-10-07
Review via email: mp+307828@code.launchpad.net