fix the window buttons in panel + touch controls overlay
commit55cb6528b559883f8a1ed429a5b20c2fbf0567dd
authorLukáš Tinkl <lukas.tinkl@canonical.com>
dateFri 20 May 2016, 14:42 (10 years ago)
parente8ed54e
qml/Panel/Panel.qml+1−1
@@ -128,7 +128,7 @@ Item {
128128
129129 visible: ((PanelState.buttonsVisible && parent.containsMouse) || TouchControlsState.buttonsShownInPanel)
130130 && !root.locked && !callHint.visible
131− active: PanelState.buttonsVisible || TouchControlsState.overlayShown
131+ active: PanelState.buttonsVisible || TouchControlsState.buttonsShownInPanel
132132 windowIsMaximized: true
133133 onCloseClicked: PanelState.closeClicked()
134134 onMinimizeClicked: PanelState.minimizeClicked()
qml/Stages/DesktopStage.qml+1−1
@@ -579,7 +579,7 @@ AbstractStage {
579579 Binding {
580580 target: TouchControlsState
581581 property: "buttonsShownInPanel"
582− value: appDelegate && appDelegate.maximized
582+ value: appDelegate && appDelegate.maximized && touchControls.overlayShown
583583 }
584584
585585 WindowResizeArea {
qml/Stages/WindowControlsOverlay.qml−1
@@ -19,7 +19,6 @@ import Ubuntu.Components 1.3
1919import Ubuntu.Gestures 0.1
2020import Unity.Application 0.1
2121import "../Components/PanelState"
22−import "../Components/TouchControlsState"
2322
2423Item {
2524 id: root