Merge lp:~mzanetti/reminders-app/fix-pulldown-positioning into lp:reminders-app

Proposed by Michael Zanetti
Status: Merged
Approved by: David Planella
Approved revision: 292
Merged at revision: 295
Proposed branch: lp:~mzanetti/reminders-app/fix-pulldown-positioning
Merge into: lp:reminders-app
Diff against target: 29 lines (+4/-4)
1 file modified
src/app/qml/components/PulldownListView.qml (+4/-4)
To merge this branch: bzr merge lp:~mzanetti/reminders-app/fix-pulldown-positioning
Reviewer Review Type Date Requested Status
David Planella Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+240945@code.launchpad.net

Commit message

fix pulldown positioning

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
David Planella (dpm) wrote :

LGTM, tested to work!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/qml/components/PulldownListView.qml'
2--- src/app/qml/components/PulldownListView.qml 2014-09-23 12:39:27 +0000
3+++ src/app/qml/components/PulldownListView.qml 2014-11-06 19:18:21 +0000
4@@ -32,13 +32,13 @@
5 }
6
7 Label {
8- width: root.width
9+ anchors { left: parent.left; right: parent.right; bottom: parent.top }
10+ anchors.bottomMargin: root.contentY - root.originY
11 height: units.gu(3)
12- anchors.bottom: root.contentItem.top;
13 fontSize: 'medium'
14 horizontalAlignment: Text.AlignHCenter
15 text: priv.toBeReloaded ? i18n.tr("Release to refresh") : i18n.tr("Pull down to refresh")
16- color: "#b3b3b3"
17+ color: "#b3b3b3"
18 }
19
20 onMovementStarted: {
21@@ -48,7 +48,7 @@
22
23 onContentYChanged: {
24 if (dragging) {
25- if (priv.wasAtYBeginning && priv.initialContentY - contentY > units.gu(5)) {
26+ if (priv.wasAtYBeginning && priv.initialContentY - contentY > units.gu(10)) {
27 priv.toBeReloaded = true
28 }
29 else {

Subscribers

People subscribed via source and target branches