Unity 8

Merge lp:~cimi/unity8/fix-1204300 into lp:unity8

  1. fix-1204300
  2. Merge into trunk
Proposed by Andrea Cimitan
Status: Merged
Approved by: Michał Sawicz
Approved revision: 480
Merged at revision: 492
Proposed branch: lp:~cimi/unity8/fix-1204300
Merge into: lp:unity8
Diff against target: 12 lines (+1/-1)
1 file modified
Components/Carousel.qml (+1/-1)
To merge this branch: bzr merge lp:~cimi/unity8/fix-1204300
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michał Sawicz Approve
Review via email: mp+192006@code.launchpad.net

Commit message

Allow drag over bounds, but not overshoot

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:479
http://jenkins.qa.ubuntu.com/job/unity8-ci/1462/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/5118
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/3117/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2334
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/485
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1466
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1466/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1461
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1282
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/993
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/993/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/3119
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/3119/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2604/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2655/console
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/239
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/237

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1462/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

Yeah, this looks much better.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/631/
Executed test runs:
    SUCCESS: http://10.97.0.26:8080/job/generic-cleanup-mbs/3071
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/340/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/328
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/91
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/17/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/17
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/17/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/340/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/328
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/328/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2997
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/920

review: Needs Fixing (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

Bzr connection issues, restarted.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:480
http://jenkins.qa.ubuntu.com/job/unity8-ci/1548/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/345
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/333
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/94
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/72
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/72/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/324
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/345
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/345/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/333
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/333/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3002
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/925

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1548/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Components/Carousel.qml'
2--- Components/Carousel.qml 2013-10-16 16:37:00 +0000
3+++ Components/Carousel.qml 2013-10-25 13:56:22 +0000
4@@ -136,7 +136,7 @@
5 height: listView.tileHeight
6 }
7
8- boundsBehavior: Flickable.StopAtBounds
9+ boundsBehavior: Flickable.DragOverBounds
10 cacheBuffer: carousel.cacheBuffer
11 flickDeceleration: Math.max(1500 * Math.pow(realWidth / referenceWidth, 1.5), 1500) // 1500 is platform default
12 maximumFlickVelocity: Math.max(2500 * Math.pow(realWidth / referenceWidth, 1.5), 2500) // 2500 is platform default

Subscribers

People subscribed via source and target branches