git.iko.soy/unity8
on xenial help sign in
sync fixes from trunk
67fd442Michael Zanetti
qml/Stages/TabletStage.qml+8−2
compare with xenial
unifiedsplit
@@ -112,6 +112,7 @@ Item {
112 }
112 }
113
113
114 onApplicationRemoved: {
114 onApplicationRemoved: {
115+ printStack()
115 if (priv.mainStageAppId == appId) {
116 if (priv.mainStageAppId == appId) {
116 priv.mainStageAppId = "";
117 priv.mainStageAppId = "";
117 }
118 }
@@ -119,6 +120,9 @@ Item {
119 priv.sideStageAppId = "";
120 priv.sideStageAppId = "";
120 }
121 }
121 }
122 }
123+ onApplicationAdded: {
124+ printStack()
125+ }
122 }
126 }
123
127
124 function printStack() {
128 function printStack() {
@@ -260,14 +264,12 @@ Item {
260 // We don't want to really reorder them in the model because that allows us to keep track
264 // We don't want to really reorder them in the model because that allows us to keep track
261 // of the last focused order.
265 // of the last focused order.
262 function indexToZIndex(index) {
266 function indexToZIndex(index) {
263− print("zIndex calc for index", index);
264 var app = ApplicationManager.get(index);
267 var app = ApplicationManager.get(index);
265 if (!app) {
268 if (!app) {
266 return index;
269 return index;
267 }
270 }
268
271
269 var isActive = app.appId == priv.mainStageAppId || app.appId == priv.sideStageAppId;
272 var isActive = app.appId == priv.mainStageAppId || app.appId == priv.sideStageAppId;
270− print("got app", app.appId, isActive)
271 if (isActive && app.stage == ApplicationInfoInterface.MainStage) return 0;
273 if (isActive && app.stage == ApplicationInfoInterface.MainStage) return 0;
272 if (isActive && app.stage == ApplicationInfoInterface.SideStage) {
274 if (isActive && app.stage == ApplicationInfoInterface.SideStage) {
273 if (!priv.mainStageAppId) {
275 if (!priv.mainStageAppId) {
@@ -290,6 +292,9 @@ Item {
290 }
292 }
291 return 1;
293 return 1;
292 }
294 }
295+ if (index == 2 && spreadView.nextInStack == 1) {
296+ return 3;
297+ }
293 return index;
298 return index;
294 }
299 }
295
300
@@ -336,6 +341,7 @@ Item {
336 x: spreadView.width
341 x: spreadView.width
337 z: spreadView.indexToZIndex(index)
342 z: spreadView.indexToZIndex(index)
338
343
344+ onZChanged: print("z changed for", model.appId, z)
339 onWidthChanged: print("width changed!", width)
345 onWidthChanged: print("width changed!", width)
340
346
341 active: model.appId == priv.mainStageAppId || model.appId == priv.sideStageAppId
347 active: model.appId == priv.mainStageAppId || model.appId == priv.sideStageAppId