on xenial help sign in
shuffle screenshot and splash "z" order

So you can actually see the screenshot fade in on the splash->screenshot transition

commit334567beef821554c9fae4160f1c07309ea3e83c authorAlbert Astals Cid <albert.astals@canonical.com> dateThu 30 Apr 2015, 14:52 (11 years ago) parentb3740d4
1 file changed+22−22
qml/Stages/ApplicationWindow.qml+22−22
qml/Stages/ApplicationWindow.qml+22−22
@@ -76,6 +76,28 @@ FocusScope {
7676 onTriggered: { if (sessionContainer.surface) {d.surfaceInitialized = true;} }
7777 }
7878
79+ Loader {
80+ id: splashLoader
81+ objectName: "splashLoader"
82+ visible: active
83+ active: false
84+ anchors.fill: parent
85+ sourceComponent: Component {
86+ Splash {
87+ id: splash
88+ title: d.splashTitle ? d.splashTitle : d.name
89+ imageSource: d.splashImage
90+ icon: d.icon
91+ showHeader: d.splashShowHeader
92+ backgroundColor: d.splashColor
93+ headerColor: d.splashColorHeader
94+ footerColor: d.splashColorFooter
95+ activeSpinner: d.applicationState === ApplicationInfoInterface.Starting ||
96+ d.applicationState === ApplicationInfoInterface.Running
97+ }
98+ }
99+ }
100+
79101 Image {
80102 id: screenshotImage
81103 objectName: "screenshotImage"
@@ -110,28 +132,6 @@ FocusScope {
110132 }
111133 }
112134
113− Loader {
114− id: splashLoader
115− objectName: "splashLoader"
116− visible: active
117− active: false
118− anchors.fill: parent
119− sourceComponent: Component {
120− Splash {
121− id: splash
122− title: d.splashTitle ? d.splashTitle : d.name
123− imageSource: d.splashImage
124− icon: d.icon
125− showHeader: d.splashShowHeader
126− backgroundColor: d.splashColor
127− headerColor: d.splashColorHeader
128− footerColor: d.splashColorFooter
129− activeSpinner: d.applicationState === ApplicationInfoInterface.Starting ||
130− d.applicationState === ApplicationInfoInterface.Running
131− }
132− }
133− }
134−
135135 SessionContainer {
136136 id: sessionContainer
137137 // A fake application might not even have a session property.