git.iko.soy/unity8
on xenial help sign in
make the menu and title label mutually exclusive; also prefer the menu
893c8d1Lukáš Tinkl
qml/ApplicationMenus/MenuBar.qml+1−1
compare with xenial
unifiedsplit
@@ -253,10 +253,10 @@ Item {
253 }
253 }
254
254
255 onPressed: {
255 onPressed: {
256+ mouse.accepted = false;
256 if (containsPress && !root.windowMoving) {
257 if (containsPress && !root.windowMoving) {
257 delayedPopupTimer.start();
258 delayedPopupTimer.start();
258 }
259 }
259− mouse.accepted = false;
260 }
260 }
261
261
262 function updateCurrentItemFromPosition(point) {
262 function updateCurrentItemFromPosition(point) {
qml/Stage/WindowDecoration.qml+2−2
@@ -125,7 +125,7 @@ MouseArea {
125 fontSize: "medium"
125 fontSize: "medium"
126 font.weight: root.active ? Font.Light : Font.Medium
126 font.weight: root.active ? Font.Light : Font.Medium
127 elide: Text.ElideRight
127 elide: Text.ElideRight
128− opacity: overlayShown || priv.shouldShowMenus ? 0 : 1
128+ opacity: overlayShown || menuBarLoader.visible ? 0 : 1
129 visible: opacity != 0
129 visible: opacity != 0
130 Behavior on opacity { UbuntuNumberAnimation {} }
130 Behavior on opacity { UbuntuNumberAnimation {} }
131 }
131 }
@@ -146,7 +146,7 @@ MouseArea {
146 windowMoving: root.windowMoving
146 windowMoving: root.windowMoving
147 }
147 }
148
148
149− opacity: !overlayShown && priv.shouldShowMenus ? 1 : 0
149+ opacity: (!overlayShown && priv.shouldShowMenus) || (active && priv.menuBar.valid && root.windowMoving) ? 1 : 0
150 visible: opacity == 1
150 visible: opacity == 1
151 Behavior on opacity { UbuntuNumberAnimation {} }
151 Behavior on opacity { UbuntuNumberAnimation {} }
152 }
152 }