@@ -27,8 +27,8 @@ AbstractStage {
27 objectName: "stages"
27 objectName: "stages"
28 anchors.fill: parent
28 anchors.fill: parent
30− property bool sideStageVisible: priv.sideStageAppId
30+ property alias sideStageVisible: spreadView.sideStageVisible
31− property real sideStageWidth: units.gu(40)
31+ property alias sideStageWidth: spreadView.sideStageWidth
33 // Functions to be called from outside
33 // Functions to be called from outside
34 function updateFocusedAppOrientation() {
34 function updateFocusedAppOrientation() {
@@ -343,14 +343,14 @@ AbstractStage {
343 // 2: The list is dragged further and snaps into the spread view when entering phase 2
343 // 2: The list is dragged further and snaps into the spread view when entering phase 2
344 property int phase
344 property int phase
346− readonly property int phase0Width: root.sideStageWidth
346+ readonly property int phase0Width: sideStageWidth
347− readonly property int phase1Width: root.sideStageWidth
347+ readonly property int phase1Width: sideStageWidth
349 // Those markers mark the various positions in the spread (ratio to screen width from right to left):
349 // Those markers mark the various positions in the spread (ratio to screen width from right to left):
350 // 0 - 1: following finger, snap back to the beginning on release
350 // 0 - 1: following finger, snap back to the beginning on release
351 readonly property real positionMarker1: 0.2
351 readonly property real positionMarker1: 0.2
352 // 1 - 2: curved snapping movement, snap to nextInStack on release
352 // 1 - 2: curved snapping movement, snap to nextInStack on release
353− readonly property real positionMarker2: root.sideStageWidth / spreadView.width
353+ readonly property real positionMarker2: sideStageWidth / spreadView.width
354 // 2 - 3: movement follows finger, snaps to phase 2 (full spread) on release
354 // 2 - 3: movement follows finger, snaps to phase 2 (full spread) on release
355 readonly property real positionMarker3: 0.6
355 readonly property real positionMarker3: 0.6
356 // passing 3, we detach movement from the finger and snap to phase 2 (full spread)
356 // passing 3, we detach movement from the finger and snap to phase 2 (full spread)
@@ -386,6 +386,9 @@ AbstractStage {
388 property real sideStageDragProgress: sideStage.progress
388 property real sideStageDragProgress: sideStage.progress
389+ property bool sideStageVisible: priv.sideStageAppId
390+ property real sideStageWidth: units.gu(40)
389 property bool surfaceDragging: triGestureArea.recognisedDrag
392 property bool surfaceDragging: triGestureArea.recognisedDrag
391 // In case the ApplicationManager already holds an app when starting up we're missing animations
394 // In case the ApplicationManager already holds an app when starting up we're missing animations
@@ -692,8 +695,6 @@ AbstractStage {
693 readonly property bool wantsMainStage: model.stage == ApplicationInfoInterface.MainStage
696 readonly property bool wantsMainStage: model.stage == ApplicationInfoInterface.MainStage
695− readonly property bool isDash: model.appId == "unity8-dash"
697 stage: model.stage
698 stage: model.stage
698 fullscreen: {
699 fullscreen: {
699 if (mainApp && stage === ApplicationInfoInterface.SideStage) {
700 if (mainApp && stage === ApplicationInfoInterface.SideStage) {
@@ -838,7 +839,7 @@ AbstractStage {
839 PropertyChanges {
840 PropertyChanges {
840 target: spreadTile
841 target: spreadTile
841− width: root.sideStageWidth
842+ width: spreadView.sideStageWidth
842 height: priv.landscapeHeight
843 height: priv.landscapeHeight
844 supportedOrientations: Qt.PortraitOrientation
845 supportedOrientations: Qt.PortraitOrientation