Merge lp:~nicolas-doffay/unity8/expansion-transition-fix into lp:unity8

[Nicolas d'Offay]

Standardised expansion speed in scopes.

[Nick Dedekind (nick-dedekind)]

19 + velocity: 800

veolicy is measured in units/second. which I'm guessing is pixels/second.
Should this be in gu to standardize across devices?

review: Needs Fixing

[lp:~nicolas-doffay/unity8/expansion-transition-fix]

408. By Nicolas d'Offay on 2013-10-08

Changed to grid units.

[Michał Sawicz (saviq)]

On 08.10.2013 16:45, Nick Dedekind wrote:
> veolicy is measured in units/second. which I'm guessing is pixels/second.
> Should this be in gu to standardize across devices?

Yes please.

--
Michał (Saviq) Sawicz <email address hidden>
Canonical Services Ltd.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:408
http://jenkins.qa.ubuntu.com/job/unity8-ci/1314/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4781
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2615/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2174
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/337/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1314
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1314/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1313
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/962
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/656
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/656/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2617
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2617/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2164
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2176/console

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

review: Needs Fixing (continuous-integration)

[lp:~nicolas-doffay/unity8/expansion-transition-fix]

409. By Nicolas d'Offay on 2013-10-11

Removed duration.

[Michał Sawicz (saviq)]

review: Approve

=== modified file 'Components/FilterGrid.qml'
--- Components/FilterGrid.qml	2013-10-09 07:58:13 +0000
+++ Components/FilterGrid.qml	2013-10-11 13:09:23 +0000
@@ -66,7 +66,7 @@
     height: !filterAnimation.running ? childrenRect.height : height
     clip: filterAnimation.running
 
-    NumberAnimation {
+    SmoothedAnimation {
         property bool filterEndValue
         id: filterAnimation
         target: root
@@ -75,7 +75,7 @@
         // Duration and easing here match the ListViewWithPageHeader::m_contentYAnimation
         // otherwise since both animations can run at the same time you'll get
         // some visual weirdness.
-        duration: 200
+        velocity: units.gu(100)
         easing.type: Easing.InOutQuad
         onStopped: {
             root.filter = filterEndValue;
@@ -104,6 +104,5 @@
             model: root.model
             limit: (filter && !filterAnimation.running) ? collapsedRowCount * iconTileGrid.columns : -1
         }
-
     }
 }