Merge lp:~nik90/ubuntu-clock-app/add-stopwatch-lap-animation into lp:ubuntu-clock-app/saucy

Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Nekhelesh Ramananthan
Approved revision: 381
Merged at revision: 382
Proposed branch: lp:~nik90/ubuntu-clock-app/add-stopwatch-lap-animation
Merge into: lp:ubuntu-clock-app/saucy
Diff against target: 36 lines (+12/-1)
2 files modified
stopwatch/LapList.qml (+1/-0)
stopwatch/StopwatchPage.qml (+11/-1)
To merge this branch: bzr merge lp:~nik90/ubuntu-clock-app/add-stopwatch-lap-animation
Reviewer Review Type Date Requested Status
Paolo Rotolo (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Riccardo Padovani Pending
Review via email: mp+212889@code.launchpad.net

Commit message

Adds a subtle animation to the stopwatch lap list which now slides from the bottom when a new lap is added by the user.

Description of the change

Adds a subtle animation to the stopwatch lap list which now slides from the bottom when a new lap is added by the user.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Paolo Rotolo (paolorotolo) wrote :

Looks good to me!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'stopwatch/LapList.qml'
--- stopwatch/LapList.qml 2014-02-26 20:27:13 +0000
+++ stopwatch/LapList.qml 2014-03-26 16:41:22 +0000
@@ -37,6 +37,7 @@
37 property int maxItemsVisible37 property int maxItemsVisible
3838
39 height: childrenRect.height39 height: childrenRect.height
40 visible: lapModel.count !== 0
4041
41 ListItem.ThinDivider { id: divider}42 ListItem.ThinDivider { id: divider}
4243
4344
=== modified file 'stopwatch/StopwatchPage.qml'
--- stopwatch/StopwatchPage.qml 2014-02-20 23:34:53 +0000
+++ stopwatch/StopwatchPage.qml 2014-03-26 16:41:22 +0000
@@ -294,9 +294,19 @@
294 lapModel: laps294 lapModel: laps
295 width: parent.width295 width: parent.width
296 height: childrenRect.height296 height: childrenRect.height
297 anchors.top: stopwatchFacePhoneLayoutContainer.bottom297 anchors.top: parent.bottom
298 maxItemsVisible: !wideAspect ? 5 : parseInt((stopwatchPage.height - headerHeight)/units.gu(6))298 maxItemsVisible: !wideAspect ? 5 : parseInt((stopwatchPage.height - headerHeight)/units.gu(6))
299299
300 states: State {
301 name: "newlap"
302 when: laps.count !== 0 && !wideAspect
303 AnchorChanges { target: listLap; anchors.top: stopwatchFacePhoneLayoutContainer.bottom }
304 }
305
306 transitions: Transition {
307 AnchorAnimation { duration: UbuntuAnimation.BriskDuration; easing: UbuntuAnimation.StandardEasing }
308 }
309
300 }310 }
301 }311 }
302 }312 }

Subscribers

People subscribed via source and target branches