git.iko.soy/unity8
on xenial help sign in
fix the window buttons in panel + touch controls overlay
55cb652Lukáš Tinkl
qml/Panel/Panel.qml+1−1
compare with xenial
unifiedsplit
@@ -128,7 +128,7 @@ Item {
128
128
129 visible: ((PanelState.buttonsVisible && parent.containsMouse) || TouchControlsState.buttonsShownInPanel)
129 visible: ((PanelState.buttonsVisible && parent.containsMouse) || TouchControlsState.buttonsShownInPanel)
130 && !root.locked && !callHint.visible
130 && !root.locked && !callHint.visible
131− active: PanelState.buttonsVisible || TouchControlsState.overlayShown
131+ active: PanelState.buttonsVisible || TouchControlsState.buttonsShownInPanel
132 windowIsMaximized: true
132 windowIsMaximized: true
133 onCloseClicked: PanelState.closeClicked()
133 onCloseClicked: PanelState.closeClicked()
134 onMinimizeClicked: PanelState.minimizeClicked()
134 onMinimizeClicked: PanelState.minimizeClicked()
qml/Stages/DesktopStage.qml+1−1
@@ -579,7 +579,7 @@ AbstractStage {
579 Binding {
579 Binding {
580 target: TouchControlsState
580 target: TouchControlsState
581 property: "buttonsShownInPanel"
581 property: "buttonsShownInPanel"
582− value: appDelegate && appDelegate.maximized
582+ value: appDelegate && appDelegate.maximized && touchControls.overlayShown
583 }
583 }
584
584
585 WindowResizeArea {
585 WindowResizeArea {
qml/Stages/WindowControlsOverlay.qml−1
@@ -19,7 +19,6 @@ import Ubuntu.Components 1.3
19import Ubuntu.Gestures 0.1
19import Ubuntu.Gestures 0.1
20import Unity.Application 0.1
20import Unity.Application 0.1
21import "../Components/PanelState"
21import "../Components/PanelState"
22−import "../Components/TouchControlsState"
23
22
24Item {
23Item {
25 id: root
24 id: root