c10dd44 · unity8 · git.iko.soy

qml/Components/PanelState/PanelState.qml+1

@@ -22,6 +22,7 @@ QtObject {

22

23 property string title: ""

24 property bool buttonsVisible: false

25+ property bool closeButtonShown: true

25 property bool dropShadow: false

26 property bool dropShadow: false

26 property int panelHeight: units.gu(3)

27 property int panelHeight: units.gu(3)

27

28

qml/Panel/Panel.qml+1

@@ -126,6 +126,7 @@ Item {

126 height: indicators.minimizedPanelHeight - anchors.topMargin - anchors.bottomMargin

127 visible: PanelState.buttonsVisible && parent.containsMouse && !root.locked && !callHint.visible

128 active: PanelState.buttonsVisible

129+ closeButtonShown: PanelState.closeButtonShown

129 onClose: PanelState.close()

130 onClose: PanelState.close()

130 onMinimize: PanelState.minimize()

131 onMinimize: PanelState.minimize()

131 onMaximize: PanelState.maximize()

132 onMaximize: PanelState.maximize()

qml/Stages/DesktopStage.qml+6

@@ -220,6 +220,12 @@ AbstractStage {

220 value: priv.focusedAppDelegate && !priv.focusedAppDelegate.maximized && priv.foregroundMaximizedAppIndex !== -1

221 }

222

223+ Binding {

224+ target: PanelState

225+ property: "closeButtonShown"

226+ value: priv.focusedAppDelegate && priv.focusedAppDelegate.maximized && priv.focusedAppId != "unity8-dash"

227+ }

228+

223 Component.onDestruction: {

229 Component.onDestruction: {

224 PanelState.title = "";

230 PanelState.title = "";

225 PanelState.buttonsVisible = false;

231 PanelState.buttonsVisible = false;