on xenial help sign in
Fade in different components as design wants
commitf91fa3ce91561291f10e097cfcb9eeb7b6db8407 authorMichael Terry <michael.terry@canonical.com> dateTue 25 Mar 2014, 10:37 (13 years ago) parent92f617d
5 files changed+71−12
qml/Greeter/Greeter.qml+9 qml/Greeter/GreeterContent.qml+50−7 qml/Greeter/Infographics.qml+4−3 qml/GreeterShell.qml+7−1 qml/Panel/Panel.qml+1−1
qml/Greeter/Greeter.qml+9
@@ -65,6 +65,15 @@ Showable {
6565 }
6666 source: greeter.background
6767 fillMode: Image.PreserveAspectCrop
68+
69+ StandardAnimation {
70+ running: true
71+ target: backgroundImage
72+ property: "opacity"
73+ from: 0.0
74+ to: 1.0
75+ duration: 800
76+ }
6877 }
6978
7079 Loader {
qml/Greeter/GreeterContent.qml+50−7
@@ -32,12 +32,6 @@ MouseArea {
3232 signal selected(int uid)
3333 signal unlocked(int uid)
3434
35− Rectangle {
36− anchors.fill: parent
37− color: "black"
38− opacity: 0.4
39− }
40−
4135 MouseArea {
4236 id: teasingMouseArea
4337 anchors.fill: parent
@@ -93,6 +87,7 @@ MouseArea {
9387 objectName: "infographics"
9488 height: narrowMode ? parent.height : 0.75 * parent.height
9589 model: greeterContentLoader.infographicModel
90+ opacity: 0.0
9691
9792 property string selectedUser
9893 property string infographicUser: AccountsService.statsWelcomeScreen ? selectedUser : ""
@@ -114,16 +109,64 @@ MouseArea {
114109 left: narrowMode ? root.left : loginLoader.right
115110 right: root.right
116111 }
112+
113+ ParallelAnimation {
114+ id: infoFadeAnimation
115+ StandardAnimation {
116+ target: infographics
117+ property: "opacity"
118+ from: 0.0
119+ to: 1.0
120+ duration: 800
121+ }
122+ StandardAnimation {
123+ target: infographics
124+ property: "scale"
125+ from: 0.9
126+ to: 1.0
127+ duration: 800
128+ }
129+ }
130+
131+ Timer {
132+ running: true
133+ interval: 200
134+ onTriggered: infoFadeAnimation.start()
135+ }
117136 }
118137
119138 Clock {
120139 id: clock
121− visible: narrowMode
140+ opacity: 0.0
122141
123142 anchors {
124143 top: parent.top
125144 topMargin: units.gu(2)
126145 horizontalCenter: parent.horizontalCenter
127146 }
147+
148+ ParallelAnimation {
149+ id: clockFadeAnimation
150+ StandardAnimation {
151+ target: clock
152+ property: "opacity"
153+ from: 0.0
154+ to: 1.0
155+ duration: 600
156+ }
157+ StandardAnimation {
158+ target: clock
159+ property: "scale"
160+ from: 0.9
161+ to: 1.0
162+ duration: 600
163+ }
164+ }
165+
166+ Timer {
167+ running: narrowMode
168+ interval: 600
169+ onTriggered: clockFadeAnimation.start()
170+ }
128171 }
129172}
qml/Greeter/Infographics.qml+4−3
@@ -24,7 +24,7 @@ Item {
2424
2525 property var model
2626
27− property int animDuration: 10
27+ property int animDuration: 2
2828
2929 Connections {
3030 target: model
@@ -46,6 +46,9 @@ Item {
4646
4747 dotShowAnimTimer.startFromBeginning()
4848 notification.showAnim.start()
49+
50+ // First show will be very fast, after that we properly animate them
51+ animDuration = 10
4952 }
5053
5154 function startHideAnimation() {
@@ -59,8 +62,6 @@ Item {
5962
6063 visible: model.label !== ""
6164
62− Component.onCompleted: startShowAnimation()
63−
6465 Item {
6566 id: dataCircle
6667 objectName: "dataCircle"
qml/GreeterShell.qml+7−1
@@ -178,10 +178,16 @@ BasicShell {
178178 hides: [launcher]
179179 available: !edgeDemo.active
180180 }
181− fullscreenMode: false
181+ fullscreenMode: initialPanelDelay.running
182182 searchVisible: false
183183 }
184184
185+ Timer {
186+ id: initialPanelDelay
187+ running: true
188+ interval: 300
189+ }
190+
185191 Launcher {
186192 id: launcher
187193
qml/Panel/Panel.qml+1−1
@@ -62,7 +62,7 @@ Item {
6262 height: __panelMinusSeparatorLineHeight
6363 y: 0
6464
65− Behavior on y { StandardAnimation {} }
65+ Behavior on y { StandardAnimation {duration: 500} }
6666 }
6767
6868 PanelSeparatorLine {