1
=== modified file 'qml/ApplicationMenus/MenuBar.qml'
2
--- qml/ApplicationMenus/MenuBar.qml	2017-03-08 09:53:21 +0000
3
+++ qml/ApplicationMenus/MenuBar.qml	2017-03-21 08:31:44 +0000
4
@@ -1,5 +1,5 @@
5
1
/*
1
/*
7
2
 * Copyright 2016 Canonical Ltd.
2
 * Copyright 2016, 2017 Canonical Ltd.
8
3
 *
3
 *
9
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
10
5
 * it under the terms of the GNU Lesser General Public License as published by
5
 * it under the terms of the GNU Lesser General Public License as published by
11
@@ -90,7 +90,7 @@
12
90
90
13
91
    Row {
91
    Row {
14
92
        id: row
92
        id: row
16
93
        spacing: units.gu(2)
93
        spacing: 0
17
94
        height: parent.height
94
        height: parent.height
18
95
95
19
96
        ActionContext {
96
        ActionContext {
20
@@ -125,7 +125,11 @@
21
125
                readonly property bool shouldDisplay: x + width + ((__ownIndex < rowRepeater.count-1) ? units.gu(2) : 0) <
125
                readonly property bool shouldDisplay: x + width + ((__ownIndex < rowRepeater.count-1) ? units.gu(2) : 0) <
22
126
                                                root.overflowWidth - ((__ownIndex < rowRepeater.count-1) ? overflowButton.width : 0)
126
                                                root.overflowWidth - ((__ownIndex < rowRepeater.count-1) ? overflowButton.width : 0)
23
127
127
25
128
                implicitWidth: column.implicitWidth
128
                // First item is not centered, it has 0 gu on the left and 1 on the right
26
129
                // so needs different width and anchors
27
130
                readonly property bool isFirstItem: __ownIndex == 0
28
131
29
132
                implicitWidth: column.implicitWidth + (isFirstItem ? units.gu(1) : units.gu(2))
30
129
                implicitHeight: row.height
133
                implicitHeight: row.height
31
130
                enabled: (model.sensitive === true) && shouldDisplay
134
                enabled: (model.sensitive === true) && shouldDisplay
32
131
                opacity: shouldDisplay ? 1 : 0
135
                opacity: shouldDisplay ? 1 : 0
33
@@ -186,7 +190,9 @@
34
186
                    id: column
190
                    id: column
35
187
                    spacing: units.gu(1)
191
                    spacing: units.gu(1)
36
188
                    anchors {
192
                    anchors {
38
189
                        centerIn: parent
193
                        verticalCenter: parent.verticalCenter
39
194
                        horizontalCenter: !visualItem.isFirstItem ? parent.horizontalCenter : undefined
40
195
                        left: visualItem.isFirstItem ? parent.left : undefined
41
190
                    }
196
                    }
42
191
197
43
192
                    Icon {
198
                    Icon {
44
@@ -381,8 +387,8 @@
45
381
        anchors {
387
        anchors {
46
382
            bottom: row.bottom
388
            bottom: row.bottom
47
383
        }
389
        }
50
384
        x: d.currentItem ? row.x + d.currentItem.x - units.gu(1) : 0
390
        x: d.currentItem ? row.x + d.currentItem.x : 0
51
385
        width: d.currentItem ? d.currentItem.width + units.gu(2) : 0
391
        width: d.currentItem ? d.currentItem.width : 0
52
386
        height: units.dp(4)
392
        height: units.dp(4)
53
387
        color: UbuntuColors.orange
393
        color: UbuntuColors.orange
54
388
        visible: d.currentItem
394
        visible: d.currentItem
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2017-03-21
Daniel d'Andrada (community)		2017-03-15	Approve on 2017-03-21
Review via email: mp+319901@code.launchpad.net