git.iko.soy/unity8
on xenial help sign in
some improvements in the sidestage
0a18b0cMichael Zanetti
qml/Stages/StageWithSideStage.qml+12−22
compare with xenial
unifiedsplit
@@ -187,16 +187,9 @@ Item {
187 priv.startingAppId = appId;
187 priv.startingAppId = appId;
188 splashScreenTimer.start();
188 splashScreenTimer.start();
189 var application = ApplicationManager.findApplication(appId)
189 var application = ApplicationManager.findApplication(appId)
190− print("Application added:", appId, application.state, application.stage)
191 if (application.stage == ApplicationInfoInterface.SideStage) {
190 if (application.stage == ApplicationInfoInterface.SideStage) {
192−// priv.sideStageAppId = appId;
193−// sideStageImage.switchTo(application)
194−// sideStageImage.visible = true;
195 sideStageSplash.visible = true;
191 sideStageSplash.visible = true;
196 } else if (application.stage == ApplicationInfoInterface.MainStage) {
192 } else if (application.stage == ApplicationInfoInterface.MainStage) {
197−// priv.mainStageAppId = appId;
198−// mainStageImage.switchTo(application)
199−// mainStageImage.visible = true;
200 mainStageSplash.visible = true;
193 mainStageSplash.visible = true;
201 }
194 }
202 }
195 }
@@ -209,15 +202,21 @@ Item {
209 mainStageImage.application = null
202 mainStageImage.application = null
210 }
203 }
211 if (sideStageImage.shown) {
204 if (sideStageImage.shown) {
212− sideStageImage.switchTo(application)
205+ sideStageImage.switchTo(application);
206+ if (priv.mainStageAppId) {
207+ mainStageImage.application = priv.mainStageApp;
213− mainStageImage.visible = true;
208+ mainStageImage.visible = true;
214− ApplicationManager.focusApplication(appId)
209+ }
215 } else {
210 } else {
216− sideStageImage.application = application
211+ sideStageImage.application = application;
217− sideStageImage.snapToApp(application)
212+ sideStageImage.snapToApp(application);
218 }
213 }
219 } else if (application.stage == ApplicationInfoInterface.MainStage) {
214 } else if (application.stage == ApplicationInfoInterface.MainStage) {
220 if (root.shown) {
215 if (root.shown) {
216+ if (sideStageImage.shown) {
217+ sideStageImage.application = priv.sideStageApp;
218+ sideStageImage.visible = true;
219+ }
221 priv.mainStageAppId = application.appId;
220 priv.mainStageAppId = application.appId;
222 mainStageImage.switchTo(application)
221 mainStageImage.switchTo(application)
223 ApplicationManager.focusApplication(appId)
222 ApplicationManager.focusApplication(appId)
@@ -235,7 +234,6 @@ Item {
235 ApplicationManager.focusApplication(appId)
234 ApplicationManager.focusApplication(appId)
236 }
235 }
237 }
236 }
238−// priv.overlayOverride = false;
239 }
237 }
240
238
241 onApplicationRemoved: {
239 onApplicationRemoved: {
@@ -265,7 +263,6 @@ Item {
265
263
266 SwitchingApplicationImage {
264 SwitchingApplicationImage {
267 id: mainStageImage
265 id: mainStageImage
268−// height: parent.height
269 anchors.bottom: parent.bottom
266 anchors.bottom: parent.bottom
270 width: parent.width
267 width: parent.width
271 visible: false
268 visible: false
@@ -273,8 +270,6 @@ Item {
273 onSwitched: {
270 onSwitched: {
274 sideStageImage.visible = false;
271 sideStageImage.visible = false;
275 }
272 }
276−
277−// Rectangle { anchors.fill: parent; color: "red"; opacity: 0.5 }
278 }
273 }
279
274
280 Rectangle {
275 Rectangle {
@@ -308,9 +303,6 @@ Item {
308
303
309 onMouseXChanged: {
304 onMouseXChanged: {
310 dragPoints.push(mouseX)
305 dragPoints.push(mouseX)
311−// if (priv.waitingForScreenshots) {
312−// return;
313−// }
314
306
315 var dragPoint = root.width + mouseX;
307 var dragPoint = root.width + mouseX;
316 if (sideStageImage.shown) {
308 if (sideStageImage.shown) {
@@ -338,7 +330,6 @@ Item {
338 sideStageImage.snapToApp(priv.sideStageApp)
330 sideStageImage.snapToApp(priv.sideStageApp)
339 }
331 }
340 }
332 }
341−// Rectangle { anchors.fill: parent; color: "purple"; opacity: .5 }
342 }
333 }
343
334
344 SwitchingApplicationImage {
335 SwitchingApplicationImage {
@@ -350,10 +341,9 @@ Item {
350 visible: true
341 visible: true
351 property bool shown: false
342 property bool shown: false
352
343
353−// Rectangle { anchors.fill: parent; color: "green"; opacity: 0.5 }
354−
355 onSwitched: {
344 onSwitched: {
356 mainStageImage.visible = false;
345 mainStageImage.visible = false;
346+ ApplicationManager.focusApplication(application.appId)
357 }
347 }
358
348
359 function snapTo(targetX) {
349 function snapTo(targetX) {