@@ -187,16 +187,9 @@ Item {
187187 priv.startingAppId = appId;
188188 splashScreenTimer.start();
189189 var application = ApplicationManager.findApplication(appId)
190− print("Application added:", appId, application.state, application.stage)
191190 if (application.stage == ApplicationInfoInterface.SideStage) {
192−// priv.sideStageAppId = appId;
193−// sideStageImage.switchTo(application)
194−// sideStageImage.visible = true;
195191 sideStageSplash.visible = true;
196192 } else if (application.stage == ApplicationInfoInterface.MainStage) {
197−// priv.mainStageAppId = appId;
198−// mainStageImage.switchTo(application)
199−// mainStageImage.visible = true;
200193 mainStageSplash.visible = true;
201194 }
202195 }
@@ -209,15 +202,21 @@ Item {
209202 mainStageImage.application = null
210203 }
211204 if (sideStageImage.shown) {
212− sideStageImage.switchTo(application)
213− mainStageImage.visible = true;
214− ApplicationManager.focusApplication(appId)
205+ sideStageImage.switchTo(application);
206+ if (priv.mainStageAppId) {
207+ mainStageImage.application = priv.mainStageApp;
208+ mainStageImage.visible = true;
209+ }
215210 } else {
216− sideStageImage.application = application
217− sideStageImage.snapToApp(application)
211+ sideStageImage.application = application;
212+ sideStageImage.snapToApp(application);
218213 }
219214 } else if (application.stage == ApplicationInfoInterface.MainStage) {
220215 if (root.shown) {
216+ if (sideStageImage.shown) {
217+ sideStageImage.application = priv.sideStageApp;
218+ sideStageImage.visible = true;
219+ }
221220 priv.mainStageAppId = application.appId;
222221 mainStageImage.switchTo(application)
223222 ApplicationManager.focusApplication(appId)
@@ -235,7 +234,6 @@ Item {
235234 ApplicationManager.focusApplication(appId)
236235 }
237236 }
238−// priv.overlayOverride = false;
239237 }
240238
241239 onApplicationRemoved: {
@@ -265,7 +263,6 @@ Item {
265263
266264 SwitchingApplicationImage {
267265 id: mainStageImage
268−// height: parent.height
269266 anchors.bottom: parent.bottom
270267 width: parent.width
271268 visible: false
@@ -273,8 +270,6 @@ Item {
273270 onSwitched: {
274271 sideStageImage.visible = false;
275272 }
276−
277−// Rectangle { anchors.fill: parent; color: "red"; opacity: 0.5 }
278273 }
279274
280275 Rectangle {
@@ -308,9 +303,6 @@ Item {
308303
309304 onMouseXChanged: {
310305 dragPoints.push(mouseX)
311−// if (priv.waitingForScreenshots) {
312−// return;
313−// }
314306
315307 var dragPoint = root.width + mouseX;
316308 if (sideStageImage.shown) {
@@ -338,7 +330,6 @@ Item {
338330 sideStageImage.snapToApp(priv.sideStageApp)
339331 }
340332 }
341−// Rectangle { anchors.fill: parent; color: "purple"; opacity: .5 }
342333 }
343334
344335 SwitchingApplicationImage {
@@ -350,10 +341,9 @@ Item {
350341 visible: true
351342 property bool shown: false
352343
353−// Rectangle { anchors.fill: parent; color: "green"; opacity: 0.5 }
354−
355344 onSwitched: {
356345 mainStageImage.visible = false;
346+ ApplicationManager.focusApplication(application.appId)
357347 }
358348
359349 function snapTo(targetX) {