Merge lp:~zsombi/ubuntu-ui-toolkit/itemselector-fix1275861 into lp:ubuntu-ui-toolkit

[Zsombor Egri]

ItemSelector regression fix.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:939
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1735/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3285
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2952
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/683
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/683
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/683/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2891
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3287
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3287/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2954
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2954/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5356
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4043

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

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

That patch indeed fixes the system settings regressions, thanks!

review: Approve (user testing)

[Florian Boucault (fboucault)]

Wonderful fix!

review: Approve

=== modified file 'modules/Ubuntu/Components/ListItems/ItemSelector.qml'
--- modules/Ubuntu/Components/ListItems/ItemSelector.qml	2013-12-05 17:00:33 +0000
+++ modules/Ubuntu/Components/ListItems/ItemSelector.qml	2014-02-18 14:25:39 +0000
@@ -156,10 +156,10 @@
           bound to the colum height) then we wouldn't be able to scroll to the end of the bottom
           boundary. The text is also invisible if none is set so this is taken into account too.*/
         var textHeight = text === "" ? 0 : label.height + column.spacing;
-        if (parent && parent.height < list.contentHeight) {
+        if (parent && parent.height > 0 && parent.height < list.contentHeight) {
             return parent.height - textHeight;
         } else {
-            list.contentHeight;
+            return list.contentHeight;
         }
     }
 

=== modified file 'tests/unit_x11/tst_components/tst_listitems_itemselector.qml'
--- tests/unit_x11/tst_components/tst_listitems_itemselector.qml	2013-11-22 14:49:12 +0000
+++ tests/unit_x11/tst_components/tst_listitems_itemselector.qml	2014-02-18 14:25:39 +0000
@@ -47,6 +47,18 @@
         }
     }
 
+    Column {
+        anchors.left: parent.left
+        anchors.right: parent.right
+
+        ListItem.ItemSelector {
+            id: expandedSelector
+            text: i18n.tr("Return results from:")
+            model: [i18n.tr("Phone only"), i18n.tr("Phone and Internet")]
+            expanded: true
+        }
+    }
+
     Component {
         id: selectorDelegate
 
@@ -108,5 +120,9 @@
             var image = findChild(testDelegate, "icon");
             compare(image.height, testDelegate.height);
          }
+
+         function test_expandedSelector() {
+             verify(expandedSelector.containerHeight > 0, "Expanded ItemSelector height negative");
+         }
     }
 }