1
=== modified file 'modules/Ubuntu/Components/ListItems/ItemSelector.qml'
2
--- modules/Ubuntu/Components/ListItems/ItemSelector.qml	2013-12-05 17:00:33 +0000
3
+++ modules/Ubuntu/Components/ListItems/ItemSelector.qml	2014-02-18 14:25:39 +0000
4
@@ -156,10 +156,10 @@
5
156
          bound to the colum height) then we wouldn't be able to scroll to the end of the bottom
156
          bound to the colum height) then we wouldn't be able to scroll to the end of the bottom
6
157
          boundary. The text is also invisible if none is set so this is taken into account too.*/
157
          boundary. The text is also invisible if none is set so this is taken into account too.*/
7
158
        var textHeight = text === "" ? 0 : label.height + column.spacing;
158
        var textHeight = text === "" ? 0 : label.height + column.spacing;
9
159
        if (parent && parent.height < list.contentHeight) {
159
        if (parent && parent.height > 0 && parent.height < list.contentHeight) {
10
160
            return parent.height - textHeight;
160
            return parent.height - textHeight;
11
161
        } else {
161
        } else {
13
162
            list.contentHeight;
162
            return list.contentHeight;
14
163
        }
163
        }
15
164
    }
164
    }
16
165
165
17
166
166
18
=== modified file 'tests/unit_x11/tst_components/tst_listitems_itemselector.qml'
19
--- tests/unit_x11/tst_components/tst_listitems_itemselector.qml	2013-11-22 14:49:12 +0000
20
+++ tests/unit_x11/tst_components/tst_listitems_itemselector.qml	2014-02-18 14:25:39 +0000
21
@@ -47,6 +47,18 @@
22
47
        }
47
        }
23
48
    }
48
    }
24
49
49
25
50
    Column {
26
51
        anchors.left: parent.left
27
52
        anchors.right: parent.right
28
53
29
54
        ListItem.ItemSelector {
30
55
            id: expandedSelector
31
56
            text: i18n.tr("Return results from:")
32
57
            model: [i18n.tr("Phone only"), i18n.tr("Phone and Internet")]
33
58
            expanded: true
34
59
        }
35
60
    }
36
61
37
50
    Component {
62
    Component {
38
51
        id: selectorDelegate
63
        id: selectorDelegate
39
52
64
40
@@ -108,5 +120,9 @@
41
108
            var image = findChild(testDelegate, "icon");
120
            var image = findChild(testDelegate, "icon");
42
109
            compare(image.height, testDelegate.height);
121
            compare(image.height, testDelegate.height);
43
110
         }
122
         }
44
123
45
124
         function test_expandedSelector() {
46
125
             verify(expandedSelector.containerHeight > 0, "Expanded ItemSelector height negative");
47
126
         }
48
111
    }
127
    }
49
112
}
128
}
Reviewer	Review Type	Date Requested	Status
Florian Boucault (community)		2014-02-18	Approve on 2014-02-18
Sebastien Bacher (community)	user testing		Approve on 2014-02-18
PS Jenkins bot	continuous-integration		Approve on 2014-02-18
Review via email: mp+206945@code.launchpad.net