git.iko.soy/unity8
on xenial help sign in
fixes
43977c9Nick Dedekind
qml/ApplicationMenus/MenuBar.qml+4−3
compare with xenial
unifiedsplit
@@ -27,6 +27,7 @@ Item {
27 // set from outside
27 // set from outside
28 property alias unityMenuModel: rowRepeater.model
28 property alias unityMenuModel: rowRepeater.model
29 property bool enableKeyFilter: false
29 property bool enableKeyFilter: false
30+ property real overflowWidth: width
30
31
31 // read from outside
32 // read from outside
32 readonly property bool valid: rowRepeater.count > 0
33 readonly property bool valid: rowRepeater.count > 0
@@ -94,7 +95,7 @@ Item {
94 property Item __popup: null;
95 property Item __popup: null;
95 property bool popupVisible: __popup && __popup.visible
96 property bool popupVisible: __popup && __popup.visible
96 property bool shouldDisplay: x + width + ((__ownIndex < rowRepeater.count-1) ? units.gu(2) : 0) <
97 property bool shouldDisplay: x + width + ((__ownIndex < rowRepeater.count-1) ? units.gu(2) : 0) <
97− root.width - ((__ownIndex < rowRepeater.count-1) ? overflowButton.width : 0)
98+ root.overflowWidth - ((__ownIndex < rowRepeater.count-1) ? overflowButton.width : 0)
98
99
99 implicitWidth: column.implicitWidth
100 implicitWidth: column.implicitWidth
100 implicitHeight: row.height
101 implicitHeight: row.height
@@ -130,8 +131,8 @@ Item {
130 }
131 }
131 }
132 }
132
133
133− onShouldDisplayChanged: {
134+ onVisibleChanged: {
134− if (!shouldDisplay && __popup) dismiss();
135+ if (!visible && __popup) dismiss();
135 }
136 }
136
137
137 Component.onCompleted: {
138 Component.onCompleted: {
qml/Panel/PanelItemRow.qml−1
@@ -168,7 +168,6 @@ Item {
168 top: parent.top
168 top: parent.top
169 bottom: parent.bottom
169 bottom: parent.bottom
170 }
170 }
171− interactive: false
172
171
173 // TODO: make this better
172 // TODO: make this better
174 // when the width changes, the highlight will lag behind due to animation, so we need to disable the animation
173 // when the width changes, the highlight will lag behind due to animation, so we need to disable the animation