Merge lp:~nik90/ubuntu-clock-app/fix-accidental-worldcity-trigger into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Prevented accidental trigger of the add world city button by setting the flickable bounds behavior to stop at bounds during a flick. After the flick has ended, it is changed back to drag over bounds.

Prevent accidental trigger of the add world city button by setting the flickable bounds behavior to stop at bounds during a flick. After the flick has ended, it is changed back to drag over bounds.

This has improved the accidental trigger in many cases.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:59
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/225/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/69
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/69/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/225

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/225/rebuild

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

Testing by popey shows promising results. The accidental trigger is much less now.

[Nekhelesh Ramananthan (nik90)]

Design has provided a new design. Thereby rejecting this branch.

review: Disapprove

Unmerged revisions

59. By Nekhelesh Ramananthan on 2014-08-18

Prevent bouncy behavior when during flick

=== modified file 'app/clock/ClockPage.qml'
--- app/clock/ClockPage.qml	2014-08-06 20:14:02 +0000
+++ app/clock/ClockPage.qml	2014-08-18 16:52:21 +0000
@@ -50,6 +50,7 @@
         contentWidth: parent.width
         contentHeight: clock.height + date.height + locationRow.height
                        + worldCityColumn.height + units.gu(14)
+        boundsBehavior: Flickable.DragOverBounds
 
         PullToAdd {
             id: addCityButton
@@ -154,6 +155,18 @@
             anchors.topMargin: units.gu(4)
         }
 
+        onFlickStarted: {
+            boundsBehavior = Flickable.StopAtBounds
+        }
+
+        onFlickEnded: {
+            boundsBehavior = Flickable.DragOverBounds
+        }
+
+        onDragStarted: {
+            boundsBehavior = Flickable.DragOverBounds
+        }
+
         onDragEnded: {
             if(contentY < _minThreshold) {
                 mainStack.push(Qt.resolvedUrl("../worldclock/WorldCityList.qml"))