git.iko.soy/unity8
on xenial help sign in
make the menu and title label mutually exclusive; also prefer the menu

over the title when menu is present and moving the window to prevent the flicker while the mouse/touch moves out of the decoration

commit893c8d135de40c3144b97726639d3682250c4c32 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateWed 1 Mar 2017, 00:40 (10 years ago) parent2fcd6ed
2 files changed+3−3
compare with xenial
unifiedsplit
qml/ApplicationMenus/MenuBar.qml+1−1 qml/Stage/WindowDecoration.qml+2−2
qml/ApplicationMenus/MenuBar.qml+1−1
@@ -253,10 +253,10 @@ Item {
253253 }
254254
255255 onPressed: {
256+ mouse.accepted = false;
256257 if (containsPress && !root.windowMoving) {
257258 delayedPopupTimer.start();
258259 }
259− mouse.accepted = false;
260260 }
261261
262262 function updateCurrentItemFromPosition(point) {
qml/Stage/WindowDecoration.qml+2−2
@@ -125,7 +125,7 @@ MouseArea {
125125 fontSize: "medium"
126126 font.weight: root.active ? Font.Light : Font.Medium
127127 elide: Text.ElideRight
128− opacity: overlayShown || priv.shouldShowMenus ? 0 : 1
128+ opacity: overlayShown || menuBarLoader.visible ? 0 : 1
129129 visible: opacity != 0
130130 Behavior on opacity { UbuntuNumberAnimation {} }
131131 }
@@ -146,7 +146,7 @@ MouseArea {
146146 windowMoving: root.windowMoving
147147 }
148148
149− opacity: !overlayShown && priv.shouldShowMenus ? 1 : 0
149+ opacity: (!overlayShown && priv.shouldShowMenus) || (active && priv.menuBar.valid && root.windowMoving) ? 1 : 0
150150 visible: opacity == 1
151151 Behavior on opacity { UbuntuNumberAnimation {} }
152152 }