git.iko.soy/unity8
on xenial help sign in
fixes
commit43977c94e01311ee6808c322073ecf486d3f1d81 authorNick Dedekind <nick.dedekind@canonical.com> dateTue 24 Jan 2017, 17:34 (10 years ago) parentd88d491
2 files changed+4−4
compare with xenial
unifiedsplit
qml/ApplicationMenus/MenuBar.qml+4−3 qml/Panel/PanelItemRow.qml−1
qml/ApplicationMenus/MenuBar.qml+4−3
@@ -27,6 +27,7 @@ Item {
2727 // set from outside
2828 property alias unityMenuModel: rowRepeater.model
2929 property bool enableKeyFilter: false
30+ property real overflowWidth: width
3031
3132 // read from outside
3233 readonly property bool valid: rowRepeater.count > 0
@@ -94,7 +95,7 @@ Item {
9495 property Item __popup: null;
9596 property bool popupVisible: __popup && __popup.visible
9697 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)
9899
99100 implicitWidth: column.implicitWidth
100101 implicitHeight: row.height
@@ -130,8 +131,8 @@ Item {
130131 }
131132 }
132133
133− onShouldDisplayChanged: {
134− if (!shouldDisplay && __popup) dismiss();
134+ onVisibleChanged: {
135+ if (!visible && __popup) dismiss();
135136 }
136137
137138 Component.onCompleted: {
qml/Panel/PanelItemRow.qml−1
@@ -168,7 +168,6 @@ Item {
168168 top: parent.top
169169 bottom: parent.bottom
170170 }
171− interactive: false
172171
173172 // TODO: make this better
174173 // when the width changes, the highlight will lag behind due to animation, so we need to disable the animation