@@ -1,5 +1,5 @@
2− * Copyright (C) 2013-2016 Canonical, Ltd.
2+ * Copyright (C) 2013-2017 Canonical, Ltd.
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -84,15 +84,15 @@ Item {
84 property bool showWindowDecorationControls: (revealControls && PanelState.decorationsVisible) ||
84 property bool showWindowDecorationControls: (revealControls && PanelState.decorationsVisible) ||
85 PanelState.decorationsAlwaysVisible
85 PanelState.decorationsAlwaysVisible
87− property bool showPointerMenu: revealControls &&
87+ property bool showPointerMenu: revealControls && enablePointerMenu &&
88 (PanelState.decorationsVisible || mode == "staged")
88 (PanelState.decorationsVisible || mode == "staged")
90− property bool enablePointerMenu: revealControls &&
91− applicationMenus.available &&
90+ property bool enablePointerMenu: applicationMenus.available &&
92 applicationMenus.model
91 applicationMenus.model
94 property bool showTouchMenu: !greeterShown &&
93 property bool showTouchMenu: !greeterShown &&
95− !showPointerMenu
94+ !showPointerMenu &&
95+ !showWindowDecorationControls
97 property bool enableTouchMenus: showTouchMenu &&
97 property bool enableTouchMenus: showTouchMenu &&
98 applicationMenus.available &&
98 applicationMenus.available &&
@@ -205,7 +205,7 @@ Item {
205 opacity: d.showPointerMenu ? 1 : 0
205 opacity: d.showPointerMenu ? 1 : 0
206 visible: opacity != 0
206 visible: opacity != 0
207 Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
207 Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
208− active: __applicationMenus.model
208+ active: d.showPointerMenu && !callHint.visible
210 width: parent.width - windowControlButtons.width - units.gu(2) - __indicators.barWidth
210 width: parent.width - windowControlButtons.width - units.gu(2) - __indicators.barWidth