git.iko.soy/unity8
on xenial help sign in
fixes
d88d491Nick Dedekind
qml/ApplicationMenus/MenuBar.qml+3−4
compare with xenial
unifiedsplit
@@ -27,7 +27,6 @@ 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
31
30
32 // read from outside
31 // read from outside
33 readonly property bool valid: rowRepeater.count > 0
32 readonly property bool valid: rowRepeater.count > 0
@@ -95,7 +94,7 @@ Item {
95 property Item __popup: null;
94 property Item __popup: null;
96 property bool popupVisible: __popup && __popup.visible
95 property bool popupVisible: __popup && __popup.visible
97 property bool shouldDisplay: x + width + ((__ownIndex < rowRepeater.count-1) ? units.gu(2) : 0) <
96 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)
99
98
100 implicitWidth: column.implicitWidth
99 implicitWidth: column.implicitWidth
101 implicitHeight: row.height
100 implicitHeight: row.height
@@ -131,8 +130,8 @@ Item {
131 }
130 }
132 }
131 }
133
132
134− onVisibleChanged: {
133+ onShouldDisplayChanged: {
135− if (!visible && __popup) dismiss();
134+ if (!shouldDisplay && __popup) dismiss();
136 }
135 }
137
136
138 Component.onCompleted: {
137 Component.onCompleted: {
qml/Panel/Panel.qml+4−2
@@ -209,6 +209,8 @@ Item {
209 Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
209 Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
210 active: __applicationMenus.model
210 active: __applicationMenus.model
211
211
212+ width: parent.width - windowControlButtons.width - units.gu(2) - __indicators.barWidth
213+
212 property bool menusRequested: menuBarLoader.item ? menuBarLoader.item.showRequested : false
214 property bool menusRequested: menuBarLoader.item ? menuBarLoader.item.showRequested : false
213
215
214 sourceComponent: MenuBar {
216 sourceComponent: MenuBar {
@@ -255,7 +257,7 @@ Item {
255 openedHeight: root.height
257 openedHeight: root.height
256 alignment: Qt.AlignLeft
258 alignment: Qt.AlignLeft
257 enableHint: !callHint.active && !fullscreenMode
259 enableHint: !callHint.active && !fullscreenMode
258− showOnClick: false
260+ showOnClick: !callHint.visible
259 panelColor: panelAreaBackground.color
261 panelColor: panelAreaBackground.color
260
262
261 onShowTapped: {
263 onShowTapped: {
@@ -385,7 +387,7 @@ Item {
385 }
387 }
386
388
387 enabled: !applicationMenus.expanded
389 enabled: !applicationMenus.expanded
388− opacity: !applicationMenus.expanded ? 1 : 0
390+ opacity: !callHint.visible && !applicationMenus.expanded ? 1 : 0
389 Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
391 Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
390
392
391 onEnabledChanged: {
393 onEnabledChanged: {
qml/Panel/PanelItemRow.qml+1
@@ -168,6 +168,7 @@ Item {
168 top: parent.top
168 top: parent.top
169 bottom: parent.bottom
169 bottom: parent.bottom
170 }
170 }
171+ interactive: false
171
172
172 // TODO: make this better
173 // TODO: make this better
173 // when the width changes, the highlight will lag behind due to animation, so we need to disable the animation
174 // when the width changes, the highlight will lag behind due to animation, so we need to disable the animation