Merge lp:~ahayzen/ubuntu-ui-toolkit/fix-swipe-delete-001 into lp:ubuntu-ui-toolkit

[Andrew Hayzen]

* Fixed text not aligned at vertical centre if the listitem height has changed dynamically
* Fixed no removeItemAnimation if the listitem height has been set

Fixed an issue with the text in the background indicator not being vertically aligned in the centre if the list item has had its height dynamically changed [1].

Fixed an issue where there is no remove animation if the height of the list item has been set.

1 - http://ubuntuone.com/1tgxcAqlKOwspASY506NBs (Left shows with patch, right shows without)

[Tim Peeters (tpeeters)]

Both for the Image and the Label is not immediately clear to my why the changes in the anchors change something. The image has fillMode: Image.Pad, which I think should add padding above and below the icon, thus positioning it in vertical center. But anchoring in verticalCenter explicitly is better.

For the Label, it has "verticalAlignment: Text.AlignVCenter". Why doesn't that work? Perhaps text is repositioned too late (after it is shown).

Can you report the positioning issue as a bug (maybe with a small code example) to make it more clear? We'll link the bug to this MR then so that we know which issue was fixed when.

28 - property: "implicitHeight"
29 + property: "height,implicitHeight"

height should depend on implicitHeight. Why do you need it?

review: Needs Information

[Andrew Hayzen (ahayzen)]

I've reported the bug 1263186 and linked it to the branch.

For the animation, it wouldn't appear to do anything on the list items which have their height set unless I added "height", I'll try it again to confirm that this is correct.

[Tim Peeters (tpeeters)]

29 + property: "height,implicitHeight"

animating height would be enough

[Tim Peeters (tpeeters)]

Looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/541/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2036/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1943/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-autolanding/144/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-autolanding/144
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-autolanding/144/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2036/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1943
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1943/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4417/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2763

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/543/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2056
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1963
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-autolanding/146
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-autolanding/146
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-autolanding/146/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1803
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2056
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2056/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1963
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1963/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4436
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2784

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/545/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2098
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1997/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-autolanding/148
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-autolanding/148
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-autolanding/148/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1842
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2098
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2098/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1997
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1997/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4469/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2833

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

This still hasn't landed? Did the property name change break something?

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/562/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2341
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2218/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-autolanding/165
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-autolanding/165
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-autolanding/165/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2053
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2343
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2343/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2218
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2218/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4675/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3099

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

I don't know why autolanding is failing here. I duplicated the MR here: https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/fix-swipe-delete-001/+merge/201784 to see if the continuous-integration tests fail there.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/ListItems/Empty.qml'
--- modules/Ubuntu/Components/ListItems/Empty.qml	2013-12-10 16:13:17 +0000
+++ modules/Ubuntu/Components/ListItems/Empty.qml	2014-01-14 12:35:53 +0000
@@ -377,8 +377,7 @@
                         source: "artwork/delete.png"
                         fillMode: Image.Pad
                         anchors {
-                            top: parent.top
-                            bottom: parent.bottom
+                            verticalCenter: parent.verticalCenter
                         }
                         width: units.gu(5)
                     }
@@ -386,8 +385,7 @@
                         text: i18n.tr("Delete")
                         verticalAlignment: Text.AlignVCenter
                         anchors {
-                            top: parent.top
-                            bottom: parent.bottom
+                            verticalCenter: parent.verticalCenter
                         }
                         width: units.gu(7)
                         fontSize: "medium"
@@ -450,7 +448,7 @@
         running: false
         UbuntuNumberAnimation {
             target: emptyListItem
-            property: "implicitHeight"
+            property: "height"
             to: 0
         }
         ScriptAction {