git.iko.soy/unity8
on xenial help sign in
don't apply transitions if a delegate is created while we're in spread
commit6e2f048815aec449b202f2d461e0cbed1af58f6e authorMichael Zanetti <michael.zanetti@canonical.com> dateThu 16 Mar 2017, 13:45 (10 years ago) parentdcb2e88
2 files changed+172−167
compare with xenial
unifiedsplit
qml/Stage/ApplicationWindow.qml+167−167 qml/Stage/Stage.qml+5
qml/Stage/ApplicationWindow.qml+167−167
@@ -234,172 +234,172 @@ FocusScope {
234234 property Item first: null
235235 }
236236
237− StateGroup {
238− id: stateGroup
239− objectName: "applicationWindowStateGroup"
240− states: [
241− State {
242− name: "void"
243− when:
244− d.hadSurface && (!root.surface || !d.surfaceInitialized)
245− &&
246− screenshotImage.status !== Image.Ready
247− },
248− State {
249− name: "splashScreen"
250− when:
251− !d.hadSurface && (!root.surface || !d.surfaceInitialized)
252− &&
253− screenshotImage.status !== Image.Ready
254− },
255− State {
256− name: "surface"
257− when:
258− (root.surface && d.surfaceInitialized)
259− &&
260− (d.liveSurface ||
261− (d.applicationState !== ApplicationInfoInterface.Running
262− && screenshotImage.status !== Image.Ready))
263− PropertyChanges {
264− target: root
265− implicitWidth: surfaceContainer.implicitWidth
266− implicitHeight: surfaceContainer.implicitHeight
267− }
268− },
269− State {
270− name: "screenshot"
271− when:
272− screenshotImage.status === Image.Ready
273− &&
274− (d.applicationState !== ApplicationInfoInterface.Running
275− || !root.surface || !d.surfaceInitialized)
276− },
277− State {
278− // This is a dead end. From here we expect the surface to be removed from the model
279− // shortly after we stop referencing to it in our SurfaceContainer.
280− name: "closed"
281− when:
282− // The surface died while the application is running. It must have been closed
283− // by the shell or the application decided to destroy it by itself
284− root.surface && d.surfaceInitialized && !d.liveSurface
285− && d.applicationState === ApplicationInfoInterface.Running
286− }
287− ]
237+// StateGroup {
238+// id: stateGroup
239+// objectName: "applicationWindowStateGroup"
240+// states: [
241+// State {
242+// name: "void"
243+// when:
244+// d.hadSurface && (!root.surface || !d.surfaceInitialized)
245+// &&
246+// screenshotImage.status !== Image.Ready
247+// },
248+// State {
249+// name: "splashScreen"
250+// when:
251+// !d.hadSurface && (!root.surface || !d.surfaceInitialized)
252+// &&
253+// screenshotImage.status !== Image.Ready
254+// },
255+// State {
256+// name: "surface"
257+// when:
258+// (root.surface && d.surfaceInitialized)
259+// &&
260+// (d.liveSurface ||
261+// (d.applicationState !== ApplicationInfoInterface.Running
262+// && screenshotImage.status !== Image.Ready))
263+// PropertyChanges {
264+// target: root
265+// implicitWidth: surfaceContainer.implicitWidth
266+// implicitHeight: surfaceContainer.implicitHeight
267+// }
268+// },
269+// State {
270+// name: "screenshot"
271+// when:
272+// screenshotImage.status === Image.Ready
273+// &&
274+// (d.applicationState !== ApplicationInfoInterface.Running
275+// || !root.surface || !d.surfaceInitialized)
276+// },
277+// State {
278+// // This is a dead end. From here we expect the surface to be removed from the model
279+// // shortly after we stop referencing to it in our SurfaceContainer.
280+// name: "closed"
281+// when:
282+// // The surface died while the application is running. It must have been closed
283+// // by the shell or the application decided to destroy it by itself
284+// root.surface && d.surfaceInitialized && !d.liveSurface
285+// && d.applicationState === ApplicationInfoInterface.Running
286+// }
287+// ]
288288
289− transitions: [
290− Transition {
291− from: ""; to: "splashScreen"
292− PropertyAction { target: splashLoader; property: "active"; value: true }
293− PropertyAction { target: surfaceContainer
294− property: "visible"; value: false }
295− },
296− Transition {
297− from: "splashScreen"; to: "surface"
298− SequentialAnimation {
299− PropertyAction { target: surfaceContainer
300− property: "opacity"; value: 0.0 }
301− PropertyAction { target: surfaceContainer
302− property: "visible"; value: true }
303− UbuntuNumberAnimation { target: surfaceContainer; property: "opacity";
304− from: 0.0; to: 1.0
305− duration: UbuntuAnimation.BriskDuration }
306− ScriptAction { script: {
307− splashLoader.active = false;
308− surfaceIsOldTimer.start();
309− } }
310− }
311− },
312− Transition {
313− from: "surface"; to: "splashScreen"
314− SequentialAnimation {
315− ScriptAction { script: {
316− surfaceIsOldTimer.stop();
317− d.surfaceOldEnoughToBeResized = false;
318− splashLoader.active = true;
319− surfaceContainer.visible = true;
320− } }
321− UbuntuNumberAnimation { target: splashLoader; property: "opacity";
322− from: 0.0; to: 1.0
323− duration: UbuntuAnimation.BriskDuration }
324− PropertyAction { target: surfaceContainer
325− property: "visible"; value: false }
326− }
327− },
328− Transition {
329− from: "surface"; to: "screenshot"
330− SequentialAnimation {
331− ScriptAction { script: {
332− surfaceIsOldTimer.stop();
333− d.surfaceOldEnoughToBeResized = false;
334− screenshotImage.visible = true;
335− } }
336− UbuntuNumberAnimation { target: screenshotImage; property: "opacity";
337− from: 0.0; to: 1.0
338− duration: UbuntuAnimation.BriskDuration }
339− ScriptAction { script: {
340− surfaceContainer.visible = false;
341− surfaceContainer.surface = null;
342− d.hadSurface = true;
343− } }
344− }
345− },
346− Transition {
347− from: "screenshot"; to: "surface"
348− SequentialAnimation {
349− PropertyAction { target: surfaceContainer
350− property: "visible"; value: true }
351− UbuntuNumberAnimation { target: screenshotImage; property: "opacity";
352− from: 1.0; to: 0.0
353− duration: UbuntuAnimation.BriskDuration }
354− ScriptAction { script: {
355− screenshotImage.visible = false;
356− screenshotImage.source = "";
357− surfaceIsOldTimer.start();
358− } }
359− }
360− },
361− Transition {
362− from: "splashScreen"; to: "screenshot"
363− SequentialAnimation {
364− PropertyAction { target: screenshotImage
365− property: "visible"; value: true }
366− UbuntuNumberAnimation { target: screenshotImage; property: "opacity";
367− from: 0.0; to: 1.0
368− duration: UbuntuAnimation.BriskDuration }
369− PropertyAction { target: splashLoader; property: "active"; value: false }
370− }
371− },
372− Transition {
373− from: "surface"; to: "void"
374− ScriptAction { script: {
375− surfaceIsOldTimer.stop();
376− d.surfaceOldEnoughToBeResized = false;
377− surfaceContainer.visible = false;
378− } }
379− },
380− Transition {
381− from: "void"; to: "surface"
382− SequentialAnimation {
383− PropertyAction { target: surfaceContainer; property: "opacity"; value: 0.0 }
384− PropertyAction { target: surfaceContainer; property: "visible"; value: true }
385− UbuntuNumberAnimation { target: surfaceContainer; property: "opacity";
386− from: 0.0; to: 1.0
387− duration: UbuntuAnimation.BriskDuration }
388− ScriptAction { script: {
389− surfaceIsOldTimer.start();
390− } }
391− }
392− },
393− Transition {
394− to: "closed"
395− SequentialAnimation {
396− ScriptAction { script: {
397− surfaceContainer.visible = false;
398− surfaceContainer.surface = null;
399− d.hadSurface = true;
400− } }
401− }
402− }
403− ]
404− }
289+// transitions: [
290+// Transition {
291+// from: ""; to: "splashScreen"
292+// PropertyAction { target: splashLoader; property: "active"; value: true }
293+// PropertyAction { target: surfaceContainer
294+// property: "visible"; value: false }
295+// },
296+// Transition {
297+// from: "splashScreen"; to: "surface"
298+// SequentialAnimation {
299+// PropertyAction { target: surfaceContainer
300+// property: "opacity"; value: 0.0 }
301+// PropertyAction { target: surfaceContainer
302+// property: "visible"; value: true }
303+// UbuntuNumberAnimation { target: surfaceContainer; property: "opacity";
304+// from: 0.0; to: 1.0
305+// duration: UbuntuAnimation.BriskDuration }
306+// ScriptAction { script: {
307+// splashLoader.active = false;
308+// surfaceIsOldTimer.start();
309+// } }
310+// }
311+// },
312+// Transition {
313+// from: "surface"; to: "splashScreen"
314+// SequentialAnimation {
315+// ScriptAction { script: {
316+// surfaceIsOldTimer.stop();
317+// d.surfaceOldEnoughToBeResized = false;
318+// splashLoader.active = true;
319+// surfaceContainer.visible = true;
320+// } }
321+// UbuntuNumberAnimation { target: splashLoader; property: "opacity";
322+// from: 0.0; to: 1.0
323+// duration: UbuntuAnimation.BriskDuration }
324+// PropertyAction { target: surfaceContainer
325+// property: "visible"; value: false }
326+// }
327+// },
328+// Transition {
329+// from: "surface"; to: "screenshot"
330+// SequentialAnimation {
331+// ScriptAction { script: {
332+// surfaceIsOldTimer.stop();
333+// d.surfaceOldEnoughToBeResized = false;
334+// screenshotImage.visible = true;
335+// } }
336+// UbuntuNumberAnimation { target: screenshotImage; property: "opacity";
337+// from: 0.0; to: 1.0
338+// duration: UbuntuAnimation.BriskDuration }
339+// ScriptAction { script: {
340+// surfaceContainer.visible = false;
341+// surfaceContainer.surface = null;
342+// d.hadSurface = true;
343+// } }
344+// }
345+// },
346+// Transition {
347+// from: "screenshot"; to: "surface"
348+// SequentialAnimation {
349+// PropertyAction { target: surfaceContainer
350+// property: "visible"; value: true }
351+// UbuntuNumberAnimation { target: screenshotImage; property: "opacity";
352+// from: 1.0; to: 0.0
353+// duration: UbuntuAnimation.BriskDuration }
354+// ScriptAction { script: {
355+// screenshotImage.visible = false;
356+// screenshotImage.source = "";
357+// surfaceIsOldTimer.start();
358+// } }
359+// }
360+// },
361+// Transition {
362+// from: "splashScreen"; to: "screenshot"
363+// SequentialAnimation {
364+// PropertyAction { target: screenshotImage
365+// property: "visible"; value: true }
366+// UbuntuNumberAnimation { target: screenshotImage; property: "opacity";
367+// from: 0.0; to: 1.0
368+// duration: UbuntuAnimation.BriskDuration }
369+// PropertyAction { target: splashLoader; property: "active"; value: false }
370+// }
371+// },
372+// Transition {
373+// from: "surface"; to: "void"
374+// ScriptAction { script: {
375+// surfaceIsOldTimer.stop();
376+// d.surfaceOldEnoughToBeResized = false;
377+// surfaceContainer.visible = false;
378+// } }
379+// },
380+// Transition {
381+// from: "void"; to: "surface"
382+// SequentialAnimation {
383+// PropertyAction { target: surfaceContainer; property: "opacity"; value: 0.0 }
384+// PropertyAction { target: surfaceContainer; property: "visible"; value: true }
385+// UbuntuNumberAnimation { target: surfaceContainer; property: "opacity";
386+// from: 0.0; to: 1.0
387+// duration: UbuntuAnimation.BriskDuration }
388+// ScriptAction { script: {
389+// surfaceIsOldTimer.start();
390+// } }
391+// }
392+// },
393+// Transition {
394+// to: "closed"
395+// SequentialAnimation {
396+// ScriptAction { script: {
397+// surfaceContainer.visible = false;
398+// surfaceContainer.surface = null;
399+// d.hadSurface = true;
400+// } }
401+// }
402+// }
403+// ]
404+// }
405405}
qml/Stage/Stage.qml+5
@@ -1569,6 +1569,10 @@ FocusScope {
15691569 }
15701570 }
15711571 ]
1572+ onStateChanged: {
1573+ print("item", index, "state changed", state)
1574+ }
1575+
15721576 transitions: [
15731577 Transition {
15741578 from: "staged,stagedWithSideStage"
@@ -1582,6 +1586,7 @@ FocusScope {
15821586 UbuntuNumberAnimation { target: appDelegate; properties: "x,y,requestedX,requestedY,requestedWidth,requestedHeight"; duration: priv.animationDuration}
15831587 },
15841588 Transition {
1589+ from: "normal,restored,maximized,maximizedHorizontally,maximizedVertically,maximizedLeft,maximizedRight,maximizedTopLeft,maximizedBottomLeft,maximizedTopRight,maximizedBottomRight,staged,stagedWithSideStage,windowedRightEdge,stagedRightEdge";
15851590 to: "spread"
15861591 // DecoratedWindow wants the scaleToPreviewSize set before enabling scaleToPreview
15871592 PropertyAction { target: appDelegate; properties: "z,visible" }