@@ -16,7 +16,7 @@
1616 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
1717*/
1818
19−import QtQuick 2.0
19+import QtQuick 2.2
2020import Unity.Application 0.1
2121import Ubuntu.Components 1.1
2222import "../Components"
@@ -58,11 +58,23 @@ Item {
5858 SequentialAnimation {
5959 id: revealAnimation
6060
61+ PropertyAction {
62+ target: surface
63+ property: "opacity"
64+ value: 0.0
65+ }
6166 PropertyAction {
6267 target: surface
6368 property: "visible"
6469 value: true
6570 }
71+ OpacityAnimator {
72+ duration: UbuntuAnimation.FastDuration
73+ easing: UbuntuAnimation.StandardEasing
74+ target: surface
75+ from: 0.0
76+ to: 1.0
77+ }
6678 PropertyAction {
6779 target: splashLoader
6880 property: "source"
@@ -91,7 +103,7 @@ Item {
91103
92104 Timer { //FIXME - need to delay removing splash screen to allow surface resize to complete
93105 id: surfaceRevealDelay
94− interval: 100
106+ interval: 300
95107 onTriggered: surfaceContainer.revealSurface()
96108 }
97109
@@ -124,6 +136,12 @@ Item {
124136 Behavior on opacity { UbuntuNumberAnimation {} }
125137 }
126138
139+ Loader {
140+ id: splashLoader
141+ anchors.fill: surfaceContainer
142+ anchors.topMargin: maximizedAppTopMargin
143+ }
144+
127145 transform: Translate {
128146 y: dragArea.distance
129147 }
@@ -154,11 +172,6 @@ Item {
154172 state: "noSurfaceYet"
155173 }
156174
157− Loader {
158− id: splashLoader
159− anchors.fill: surfaceContainer
160− anchors.topMargin: maximizedAppTopMargin
161− }
162175
163176 DraggingArea {
164177 id: dragArea