Merge lp:~fboucault/ubuntu-ui-toolkit/list_item_single_control_min_height into lp:ubuntu-ui-toolkit

[Florian Boucault]

ListItem.SingleControl: Ensure that there is always enough vertical padding around the control.

[Sebastien Bacher (seb128)]

Looks good to me, note that it doesn't fix the specific issue I reported because I use Base to workaround the margin problem described in https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1194844 (buttons should start/end at the same horizontal position as the labels from standard items)

review: Approve

[Sebastien Bacher (seb128)]

(note that I can't change the MR status since I'm not in the toolkit team)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:589
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/279/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/778
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/136
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/136
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/136/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/780
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/780/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/699

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/279/rebuild

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/ListItems/SingleControl.qml'
--- modules/Ubuntu/Components/ListItems/SingleControl.qml	2013-04-22 11:01:36 +0000
+++ modules/Ubuntu/Components/ListItems/SingleControl.qml	2013-07-05 14:10:30 +0000
@@ -60,6 +60,9 @@
     /*! \internal */
     onPressedChanged: if (control && control.enabled) control.pressed = singleControlListItem.pressed
 
+    // Ensure that there is always enough vertical padding around the control
+    __height: control.height + __contentsMargins
+
     /*!
       \internal
      */