@@ -16,7 +16,7 @@
16 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
16 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
19−import QtQuick 2.0
19+import QtQuick 2.2
20import Unity.Application 0.1
20import Unity.Application 0.1
21import Ubuntu.Components 1.1
21import Ubuntu.Components 1.1
22import "../Components"
22import "../Components"
@@ -58,11 +58,23 @@ Item {
58 SequentialAnimation {
58 SequentialAnimation {
59 id: revealAnimation
59 id: revealAnimation
61 PropertyAction {
66 PropertyAction {
62 target: surface
67 target: surface
63 property: "visible"
68 property: "visible"
64 value: true
69 value: true
72+ duration: UbuntuAnimation.FastDuration
73+ easing: UbuntuAnimation.StandardEasing
66 PropertyAction {
78 PropertyAction {
67 target: splashLoader
79 target: splashLoader
68 property: "source"
80 property: "source"
@@ -91,7 +103,7 @@ Item {
92 Timer { //FIXME - need to delay removing splash screen to allow surface resize to complete
104 Timer { //FIXME - need to delay removing splash screen to allow surface resize to complete
93 id: surfaceRevealDelay
105 id: surfaceRevealDelay
94− interval: 100
106+ interval: 300
95 onTriggered: surfaceContainer.revealSurface()
107 onTriggered: surfaceContainer.revealSurface()
@@ -124,6 +136,12 @@ Item {
124 Behavior on opacity { UbuntuNumberAnimation {} }
136 Behavior on opacity { UbuntuNumberAnimation {} }
141+ anchors.fill: surfaceContainer
142+ anchors.topMargin: maximizedAppTopMargin
127 transform: Translate {
145 transform: Translate {
128 y: dragArea.distance
146 y: dragArea.distance
@@ -154,11 +172,6 @@ Item {
154 state: "noSurfaceYet"
172 state: "noSurfaceYet"
159− anchors.fill: surfaceContainer
160− anchors.topMargin: maximizedAppTopMargin
163 DraggingArea {
176 DraggingArea {
164 id: dragArea
177 id: dragArea