git.iko.soy/unity8
on xenial help sign in
fix side stage z index
d45fc13Michael Zanetti
qml/Stage/Stage.qml+3−3
compare with xenial
unifiedsplit
@@ -67,7 +67,7 @@ AbstractStage {
67 case "stagedWithSideStage":
67 case "stagedWithSideStage":
68 var orientations = mainApp.supportedOrientations;
68 var orientations = mainApp.supportedOrientations;
69 orientations |= Qt.LandscapeOrientation | Qt.InvertedLandscapeOrientation;
69 orientations |= Qt.LandscapeOrientation | Qt.InvertedLandscapeOrientation;
70− if (priv.sideStageItemId && !spreadView.surfaceDragging) {
70+ if (priv.sideStageItemId) {
71 // If we have a sidestage app, support Portrait orientation
71 // If we have a sidestage app, support Portrait orientation
72 // so that it will switch the sidestage app to mainstage on rotate to portrait
72 // so that it will switch the sidestage app to mainstage on rotate to portrait
73 orientations |= Qt.PortraitOrientation|Qt.InvertedPortraitOrientation;
73 orientations |= Qt.PortraitOrientation|Qt.InvertedPortraitOrientation;
@@ -261,7 +261,7 @@ AbstractStage {
261 }
261 }
262 if (mainStageIndex == 0 || sideStageIndex == 0) {
262 if (mainStageIndex == 0 || sideStageIndex == 0) {
263 if (mainStageIndex == 1 || sideStageIndex == 1) {
263 if (mainStageIndex == 1 || sideStageIndex == 1) {
264− return 2;
264+ return topLevelSurfaceList.count > 2 ? 2 : -1;
265 }
265 }
266 return 1;
266 return 1;
267 }
267 }
@@ -503,7 +503,7 @@ AbstractStage {
503 return 1;
503 return 1;
504 }
504 }
505
505
506− return 2;
506+ return 1;
507 }
507 }
508
508
509 onShownChanged: {
509 onShownChanged: {
qml/Stage/StageMaths.qml+1−1
@@ -40,7 +40,7 @@ QtObject {
40
40
41 print("App:", model.application.appId, "index:", itemIndex, "nextInStack:", nextInStack)
41 print("App:", model.application.appId, "index:", itemIndex, "nextInStack:", nextInStack)
42 if (nextInStack > 0) {
42 if (nextInStack > 0) {
43− var stageOfNextInStack = topLevelSurfaceList.applicationAt(nextInStack).stage;
43+ var stageOfNextInStack = appRepeater.itemAt(nextInStack).stage;
44
44
45 if (itemIndex === nextInStack) {
45 if (itemIndex === nextInStack) {
46 // this is the next app in stack.
46 // this is the next app in stack.