Merge lp:~aacid/unity8/enable_height_animation_when_visible into lp:unity8

[Albert Astals Cid]

Only enable the animation when the item is on screen (i.e. !culled)

Not really happy with the change since it assumes RunningApplicationsGrid will be in a LVWPH, which it always is, but ... On the other hand didn't really find a way to make it less ugly.

[Michał Sawicz (saviq)]

It's probably the easiest thing to do indeed... Otherwise we'd need to try and find out whether we're in bounds of the ListView.

Should we maybe check if the item has a "culled" property and only set it then?

review: Needs Information

[lp:~aacid/unity8/enable_height_animation_when_visible]

364. By Albert Astals Cid on 2013-10-01

fix undefined check

[Albert Astals Cid (aacid)]

> Should we maybe check if the item has a "culled" property and only set it
> then?

Unfortunately the RunningApplicationsGrid is not the direct children of LVWPH, it's just there through a ListItems.Base and a Loader so it'd be quite a hack to put that in the LVWPH code.

[lp:~aacid/unity8/enable_height_animation_when_visible]

365. By Albert Astals Cid on 2013-10-01

fixme++

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:363
http://jenkins.qa.ubuntu.com/job/unity8-ci/1190/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy-vm/157
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1949
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1962
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/213/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1190
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1190/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1189
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-vm-saucy/113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4305
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4305/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1951
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1951/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1643
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1661

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1190/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

OK, this is not working... I'm able to get it to animate with this, when I swipe at a certain speed...

Maybe we should have the Behavior enabled on-demand, when any of the transitions fired? And disable it as soon as it's complete?

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:365
http://jenkins.qa.ubuntu.com/job/unity8-ci/1192/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy-vm/163
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1963
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1965
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/215
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1192
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1192/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-vm-saucy/118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4311
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4311/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1965
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1965/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1656
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1674

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1192/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:365
http://jenkins.qa.ubuntu.com/job/unity8-ci/1198/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy-vm/175/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1984
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1972
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/221
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1198
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1198/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1197
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4323/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1986
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1986/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1676
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1693

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1198/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Dash/Apps/RunningApplicationsGrid.qml'
--- Dash/Apps/RunningApplicationsGrid.qml	2013-09-10 22:03:47 +0000
+++ Dash/Apps/RunningApplicationsGrid.qml	2013-10-01 11:40:34 +0000
@@ -29,7 +29,11 @@
         onStageScreenshotsReadyChanged: if (shell.dashShown && shell.stageScreenshotsReady) updateScreenshots();
     }
 
-    Behavior on height { NumberAnimation { duration: 200; easing.type: Easing.InOutQuad } }
+    Behavior on height {
+        // FIXME Rethink how we pass down properties from the LVWPH to the interested parties
+        enabled: culled === undefined || !culled;
+        NumberAnimation { duration: 200; easing.type: Easing.InOutQuad }
+    }
 
     property bool canEnableTerminationMode: true
 

=== modified file 'plugins/ListViewWithPageHeader/listviewwithpageheader.cpp'
--- plugins/ListViewWithPageHeader/listviewwithpageheader.cpp	2013-09-27 09:17:06 +0000
+++ plugins/ListViewWithPageHeader/listviewwithpageheader.cpp	2013-10-01 11:40:34 +0000
@@ -139,6 +139,9 @@
     QQuickItemPrivate::get(m_item)->setCulled(culled);
     if (m_sectionItem)
         QQuickItemPrivate::get(m_sectionItem)->setCulled(culled);
+
+    QQmlContext *itemContext = QQmlEngine::contextForObject(m_item)->parentContext();
+    itemContext->setContextProperty(QLatin1String("culled"), QVariant::fromValue<bool>(culled));
 }
 
 ListViewWithPageHeader::ListViewWithPageHeader()
@@ -849,6 +852,7 @@
     QQmlContext *context = QQmlEngine::contextForObject(item)->parentContext();
     context->setContextProperty(QLatin1String("ListViewWithPageHeader"), this);
     context->setContextProperty(QLatin1String("heightToClip"), QVariant::fromValue<int>(0));
+    context->setContextProperty(QLatin1String("culled"), QVariant::fromValue<bool>(false));
     if (modelIndex == m_asyncRequestedIndex) {
         createItem(modelIndex, false);
         refill();