@@ -690,7 +690,7 @@ AbstractStage {
690 readonly property bool dragging: touchControls.overlayShown ? touchControls.dragging : decoratedWindow.dragging
690 readonly property bool dragging: touchControls.overlayShown ? touchControls.dragging : decoratedWindow.dragging
692 readonly property string appId: model.application.appId
692 readonly property string appId: model.application.appId
693− readonly property bool isDash: model.application.appId == "unity8-dash"
693+ readonly property bool isDash: appId == "unity8-dash"
694 readonly property alias clientAreaItem: decoratedWindow.clientAreaItem
694 readonly property alias clientAreaItem: decoratedWindow.clientAreaItem
696 function claimFocus() {
696 function claimFocus() {
@@ -1143,7 +1143,7 @@ AbstractStage {
1146− name: "fullscreen"; when: surface ? surface.state === Mir.FullscreenState : application.fullscreen && !appDelegate.minimized
1146+ name: "fullscreen"; when: appDelegate.fullscreen
1147 PropertyChanges {
1147 PropertyChanges {
1148 target: appDelegate;
1148 target: appDelegate;
1149 requestedX: 0
1149 requestedX: 0
@@ -1496,7 +1496,7 @@ AbstractStage {
1496 objectName: "dragArea"
1496 objectName: "dragArea"
1497 anchors.fill: decoratedWindow
1497 anchors.fill: decoratedWindow
1498 enabled: false
1498 enabled: false
1499− closeable: model.application.appId !== "unity8-dash"
1499+ closeable: !appDelegate.isDash
1501 onClicked: {
1501 onClicked: {
1502 spreadItem.highlightedIndex = index;
1502 spreadItem.highlightedIndex = index;