git.iko.soy/unity8
on xenial help sign in
fixes
commitd88d49188ce50fd467bea4a039d6476aa84e37cd authorNick Dedekind <nick.dedekind@canonical.com> dateTue 24 Jan 2017, 13:10 (10 years ago) parent6df3185
3 files changed+8−6
compare with xenial
unifiedsplit
qml/ApplicationMenus/MenuBar.qml+3−4 qml/Panel/Panel.qml+4−2 qml/Panel/PanelItemRow.qml+1
qml/ApplicationMenus/MenuBar.qml+3−4
@@ -27,7 +27,6 @@ Item {
2727 // set from outside
2828 property alias unityMenuModel: rowRepeater.model
2929 property bool enableKeyFilter: false
30− property real overflowWidth: width
3130
3231 // read from outside
3332 readonly property bool valid: rowRepeater.count > 0
@@ -95,7 +94,7 @@ Item {
9594 property Item __popup: null;
9695 property bool popupVisible: __popup && __popup.visible
9796 property bool shouldDisplay: x + width + ((__ownIndex < rowRepeater.count-1) ? units.gu(2) : 0) <
98− root.overflowWidth - ((__ownIndex < rowRepeater.count-1) ? overflowButton.width : 0)
97+ root.width - ((__ownIndex < rowRepeater.count-1) ? overflowButton.width : 0)
9998
10099 implicitWidth: column.implicitWidth
101100 implicitHeight: row.height
@@ -131,8 +130,8 @@ Item {
131130 }
132131 }
133132
134− onVisibleChanged: {
135− if (!visible && __popup) dismiss();
133+ onShouldDisplayChanged: {
134+ if (!shouldDisplay && __popup) dismiss();
136135 }
137136
138137 Component.onCompleted: {
qml/Panel/Panel.qml+4−2
@@ -209,6 +209,8 @@ Item {
209209 Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
210210 active: __applicationMenus.model
211211
212+ width: parent.width - windowControlButtons.width - units.gu(2) - __indicators.barWidth
213+
212214 property bool menusRequested: menuBarLoader.item ? menuBarLoader.item.showRequested : false
213215
214216 sourceComponent: MenuBar {
@@ -255,7 +257,7 @@ Item {
255257 openedHeight: root.height
256258 alignment: Qt.AlignLeft
257259 enableHint: !callHint.active && !fullscreenMode
258− showOnClick: false
260+ showOnClick: !callHint.visible
259261 panelColor: panelAreaBackground.color
260262
261263 onShowTapped: {
@@ -385,7 +387,7 @@ Item {
385387 }
386388
387389 enabled: !applicationMenus.expanded
388− opacity: !applicationMenus.expanded ? 1 : 0
390+ opacity: !callHint.visible && !applicationMenus.expanded ? 1 : 0
389391 Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
390392
391393 onEnabledChanged: {
qml/Panel/PanelItemRow.qml+1
@@ -168,6 +168,7 @@ Item {
168168 top: parent.top
169169 bottom: parent.bottom
170170 }
171+ interactive: false
171172
172173 // TODO: make this better
173174 // when the width changes, the highlight will lag behind due to animation, so we need to disable the animation