on xenial help sign in
sync fixes from trunk
commit67fd442486c5f56b15689f92b5be92fad0885f5c authorMichael Zanetti <michael.zanetti@canonical.com> dateThu 5 Jun 2014, 13:09 (12 years ago) parent9177ca2
1 file changed+8−2
qml/Stages/TabletStage.qml+8−2
qml/Stages/TabletStage.qml+8−2
@@ -112,6 +112,7 @@ Item {
112112 }
113113
114114 onApplicationRemoved: {
115+ printStack()
115116 if (priv.mainStageAppId == appId) {
116117 priv.mainStageAppId = "";
117118 }
@@ -119,6 +120,9 @@ Item {
119120 priv.sideStageAppId = "";
120121 }
121122 }
123+ onApplicationAdded: {
124+ printStack()
125+ }
122126 }
123127
124128 function printStack() {
@@ -260,14 +264,12 @@ Item {
260264 // We don't want to really reorder them in the model because that allows us to keep track
261265 // of the last focused order.
262266 function indexToZIndex(index) {
263− print("zIndex calc for index", index);
264267 var app = ApplicationManager.get(index);
265268 if (!app) {
266269 return index;
267270 }
268271
269272 var isActive = app.appId == priv.mainStageAppId || app.appId == priv.sideStageAppId;
270− print("got app", app.appId, isActive)
271273 if (isActive && app.stage == ApplicationInfoInterface.MainStage) return 0;
272274 if (isActive && app.stage == ApplicationInfoInterface.SideStage) {
273275 if (!priv.mainStageAppId) {
@@ -290,6 +292,9 @@ Item {
290292 }
291293 return 1;
292294 }
295+ if (index == 2 && spreadView.nextInStack == 1) {
296+ return 3;
297+ }
293298 return index;
294299 }
295300
@@ -336,6 +341,7 @@ Item {
336341 x: spreadView.width
337342 z: spreadView.indexToZIndex(index)
338343
344+ onZChanged: print("z changed for", model.appId, z)
339345 onWidthChanged: print("width changed!", width)
340346
341347 active: model.appId == priv.mainStageAppId || model.appId == priv.sideStageAppId