git.iko.soy/unity8
on xenial help sign in
don't dismiss the SS if the user starts a MS app
ed035ebMichael Zanetti
qml/Stages/StageWithSideStage.qml+5−4
compare with xenial
unifiedsplit
@@ -104,7 +104,8 @@ Item {
104 mainStageAppId = focusedApplicationId;
104 mainStageAppId = focusedApplicationId;
105 priv.overlayOverride = false;
105 priv.overlayOverride = false;
106 if (priv.startingAppId == focusedApplicationId && sideStageImage.shown) {
106 if (priv.startingAppId == focusedApplicationId && sideStageImage.shown) {
107− sideStageImage.snapTo(root.width)
107+ // There was already a sidestage app on top. bring it back!
108+ ApplicationManager.focusApplication(priv.sideStageAppId)
108 priv.startingAppId = "";
109 priv.startingAppId = "";
109 }
110 }
110 } else if (focusedApplication.stage == ApplicationInfoInterface.SideStage) {
111 } else if (focusedApplication.stage == ApplicationInfoInterface.SideStage) {
@@ -216,10 +217,10 @@ Item {
216 if (root.shown) {
217 if (root.shown) {
217 priv.mainStageAppId = application.appId;
218 priv.mainStageAppId = application.appId;
218 mainStageImage.switchTo(application)
219 mainStageImage.switchTo(application)
220+ ApplicationManager.focusApplication(appId)
219 if (sideStageImage.shown) {
221 if (sideStageImage.shown) {
220− sideStageImage.snapTo(root.width)
222+ // There was already a focused SS app. Bring it back
221− } else {
222− ApplicationManager.focusApplication(appId)
223+ ApplicationManager.focusApplication(priv.sideStageAppId)
223 }
224 }
224 } else {
225 } else {
225 if (sideStageImage.shown) {
226 if (sideStageImage.shown) {