1
=== modified file 'components.api'
2
--- components.api	2014-02-26 09:47:24 +0000
3
+++ components.api	2014-02-26 09:47:24 +0000
4
@@ -567,6 +567,9 @@
5
567
    property Item pageStack
567
    property Item pageStack
6
568
    property bool opened
568
    property bool opened
7
569
    property bool locked
569
    property bool locked
8
570
modules/Ubuntu/Components/UbuntuListView.qml
9
571
ListView
10
572
    property int expandedIndex
11
570
modules/Ubuntu/Components/UbuntuNumberAnimation.qml
573
modules/Ubuntu/Components/UbuntuNumberAnimation.qml
12
571
NumberAnimation
574
NumberAnimation
13
572
modules/Ubuntu/Components/UbuntuShape.qml
575
modules/Ubuntu/Components/UbuntuShape.qml
14
573
576
15
=== modified file 'examples/ubuntu-ui-toolkit-gallery/ListItems.qml'
16
--- examples/ubuntu-ui-toolkit-gallery/ListItems.qml	2014-02-26 09:47:24 +0000
17
+++ examples/ubuntu-ui-toolkit-gallery/ListItems.qml	2014-02-26 09:47:24 +0000
18
@@ -224,6 +224,57 @@
19
224
    }
224
    }
20
225
225
21
226
    TemplateSection {
226
    TemplateSection {
22
227
        title: i18n.tr("UbuntuListView")
23
228
        className: "UbuntuListView"
24
229
25
230
        ListModel {
26
231
            id: fruitModel
27
232
            ListElement { name: "Orange"; details: "The orange (specifically, the sweet orange) is the fruit of the citrus species Citrus × sinensis in the family Rutaceae. The fruit of the Citrus sinensis is called sweet orange to distinguish it from that of the Citrus aurantium, the bitter orange. The orange is a hybrid, possibly between pomelo (Citrus maxima) and mandarin (Citrus reticulata), cultivated since ancient times.\n-\nWikipedia"}
28
233
            ListElement { name: "Apple"; details: "Fruit" }
29
234
            ListElement { name: "Tomato"; details: "The tomato is the edible, often red fruit of the plant Solanum lycopersicum, commonly known as a tomato plant. Both the species and its use as a food originated in Mexico, and spread throughout the world following the Spanish colonization of the Americas. Its many varieties are now widely grown, sometimes in greenhouses in cooler climates. The tomato is consumed in diverse ways, including raw, as an ingredient in many dishes, sauces, salads, and drinks. While it is botanically a fruit, it is considered a vegetable for culinary purposes (as well as under U.S. customs regulations, see Nix v. Hedden), which has caused some confusion. The fruit is rich in lycopene, which may have beneficial health effects. The tomato belongs to the nightshade family (Solanaceae). The plants typically grow to 1–3 meters (3–10 ft) in height and have a weak stem that often sprawls over the ground and vines over other plants. It is a perennial in its native habitat, although often grown outdoors in temperate climates as an annual. An average common tomato weighs approximately 100 grams (4 oz).\n-\nWikipedia" }
30
235
            ListElement { name: "Carrot"; details: "Vegetable" }
31
236
            ListElement { name: "Potato"; details: "Vegetable" }
32
237
        }
33
238
34
239
        Toolkit.UbuntuListView {
35
240
            id: ubuntuListView
36
241
            anchors { left: parent.left; right: parent.right }
37
242
            height: units.gu(24)
38
243
            model: fruitModel
39
244
            clip: true
40
245
41
246
            delegate: ListItem.Expandable {
42
247
                id: expandingItem
43
248
44
249
                expandedHeight: contentColumn.height + units.gu(1)
45
250
46
251
                onClicked: {
47
252
                    ubuntuListView.expandedIndex = index;
48
253
                }
49
254
50
255
                Column {
51
256
                    id: contentColumn
52
257
                    anchors { left: parent.left; right: parent.right }
53
258
                    Item {
54
259
                        anchors { left: parent.left; right: parent.right}
55
260
                        height: expandingItem.collapsedHeight
56
261
                        Toolkit.Label {
57
262
                            anchors { left: parent.left; right: parent.right; verticalCenter: parent.verticalCenter}
58
263
                            text: model.name
59
264
                        }
60
265
                    }
61
266
62
267
                    Toolkit.Label {
63
268
                        anchors { left: parent.left; right: parent.right }
64
269
                        text: model.details
65
270
                        wrapMode: Text.WordWrap
66
271
                    }
67
272
                }
68
273
            }
69
274
        }
70
275
    }
71
276
72
277
    TemplateSection {
73
227
        title: i18n.tr("ExpandablesColumn")
278
        title: i18n.tr("ExpandablesColumn")
74
228
        className: "ExpandablesColumn"
279
        className: "ExpandablesColumn"
75
229
280
76
230
281
77
=== modified file 'modules/Ubuntu/Components/ListItems/Expandable.qml'
78
--- modules/Ubuntu/Components/ListItems/Expandable.qml	2014-02-26 09:47:24 +0000
79
+++ modules/Ubuntu/Components/ListItems/Expandable.qml	2014-02-26 09:47:24 +0000
80
@@ -25,7 +25,7 @@
81
25
    components such as buttons. It subclasses \l Empty and thus brings all that
25
    components such as buttons. It subclasses \l Empty and thus brings all that
82
26
    functionality, but additionally provides means to expand and collapse the item.
26
    functionality, but additionally provides means to expand and collapse the item.
83
27
27
85
28
    When used together with an UbuntuListView or \l ExpandablesColumn it
28
    When used together with an \l UbuntuListView or \l ExpandablesColumn it
86
29
    can coordinate with other items in the list to make sure it is scrolled while
29
    can coordinate with other items in the list to make sure it is scrolled while
87
30
    expanding to be fully visible in the view. Additionally it is made sure that
30
    expanding to be fully visible in the view. Additionally it is made sure that
88
31
    only one Expandable item is expanded at a time and it is collapsed when the
31
    only one Expandable item is expanded at a time and it is collapsed when the
89
@@ -110,19 +110,25 @@
90
110
        property Item view: root.ListView.view ? root.ListView.view : (root.parent.parent.parent.hasOwnProperty("expandItem") ? root.parent.parent.parent : null)
110
        property Item view: root.ListView.view ? root.ListView.view : (root.parent.parent.parent.hasOwnProperty("expandItem") ? root.parent.parent.parent : null)
91
111
111
92
112
        /*! \internal
112
        /*! \internal
96
113
          Gives information whether this item is inside a ExpandablesListView or ExpandablesColumn
113
          Gives information whether this item is inside an item based container supporting Expandable items, such as ExpandablesColumn
97
114
         */
114
         */
98
115
        readonly property bool isInExpandableList: view && view !== undefined && view.hasOwnProperty("expandItem") && view.hasOwnProperty("collapse")
115
        readonly property bool isInExpandableColumn: view && view !== undefined && view.hasOwnProperty("expandItem") && view.hasOwnProperty("collapse")
99
116
100
117
        /*! \internal
101
118
          Gives information whether this item is inside an index based container supporting Expandable items, such as UbuntuListView
102
119
         */
103
120
        readonly property bool isInExpandableListView: view && view !== undefined && view.hasOwnProperty("expandedIndex") 
104
116
121
105
117
        /*! \internal
122
        /*! \internal
106
118
          Gives information if there is another item expanded in the containing ExpandablesListView or ExpandablesColumn
123
          Gives information if there is another item expanded in the containing ExpandablesListView or ExpandablesColumn
107
119
         */
124
         */
109
120
        readonly property bool otherExpanded: isInExpandableList && view.expandedItem !== null && view.expandedItem !== undefined && view.expandedItem !== root
125
        readonly property bool otherExpanded: (isInExpandableColumn && view.expandedItem !== null && view.expandedItem !== undefined && view.expandedItem !== root)
110
126
                                              || (isInExpandableListView && view.expandedIndex !== -1 && view.expandedIndex !== index)
111
121
127
112
122
        /*! \internal
128
        /*! \internal
113
123
          Gives information about the maximum expanded height, in case that is limited by the containing ExpandablesListView or ExpandablesColumn
129
          Gives information about the maximum expanded height, in case that is limited by the containing ExpandablesListView or ExpandablesColumn
114
124
         */
130
         */
116
125
        readonly property real maxExpandedHeight: isInExpandableList ? Math.min(view.height - collapsedHeight, expandedHeight) : expandedHeight
131
        readonly property real maxExpandedHeight: (isInExpandableColumn || isInExpandableListView) ? Math.min(view.height - collapsedHeight, expandedHeight) : expandedHeight
117
126
    }
132
    }
118
127
133
119
128
    states: [
134
    states: [
120
@@ -140,13 +146,30 @@
121
140
        }
146
        }
122
141
    ]
147
    ]
123
142
148
124
149
    Component.onCompleted: {
125
150
        if (priv.isInExpandableListView && priv.view.expandedIndex == index) {
126
151
            root.expanded = true;
127
152
        }
128
153
    }
129
154
130
155
    Connections {
131
156
        target: priv.isInExpandableListView ? priv.view : null
132
157
        onExpandedIndexChanged: {
133
158
            if (priv.view.expandedIndex == index) {
134
159
                root.expanded = true;
135
160
            } else if (root.expanded = true) {
136
161
                root.expanded = false;
137
162
            }
138
163
        }
139
164
    }
140
165
141
143
    /*! \internal */
166
    /*! \internal */
142
144
    onExpandedChanged: {
167
    onExpandedChanged: {
143
145
        if (!expanded) {
168
        if (!expanded) {
144
146
            contentFlickable.contentY = 0;
169
            contentFlickable.contentY = 0;
145
147
        }
170
        }
146
148
171
148
149
        if (priv.isInExpandableList) {
172
        if (priv.isInExpandableColumn) {
149
150
            if (expanded) {
173
            if (expanded) {
150
151
                priv.view.expandItem(root);
174
                priv.view.expandItem(root);
151
152
            } else {
175
            } else {
152
153
176
153
=== added file 'modules/Ubuntu/Components/UbuntuListView.qml'
154
--- modules/Ubuntu/Components/UbuntuListView.qml	1970-01-01 00:00:00 +0000
155
+++ modules/Ubuntu/Components/UbuntuListView.qml	2014-02-26 09:47:24 +0000
156
@@ -0,0 +1,121 @@
157
1
/*
158
2
 * Copyright 2014 Canonical Ltd.
159
3
 *
160
4
 * This program is free software; you can redistribute it and/or modify
161
5
 * it under the terms of the GNU Lesser General Public License as published by
162
6
 * the Free Software Foundation; version 3.
163
7
 *
164
8
 * This program is distributed in the hope that it will be useful,
165
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
166
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
167
11
 * GNU Lesser General Public License for more details.
168
12
 *
169
13
 * You should have received a copy of the GNU Lesser General Public License
170
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
171
15
 */
172
16
173
17
import QtQuick 2.0
174
18
import Ubuntu.Components 0.1 as Toolkit
175
19
176
20
/*!
177
21
    \qmltype UbuntuListView
178
22
    \inqmlmodule Ubuntu.Components 0.1
179
23
    \ingroup ubuntu
180
24
    \brief A ListView with special features tailored for a look and feel fitting the
181
25
    Ubuntu Touch platform.
182
26
    The UbuntuListView works just like a regular ListView, but it adds special features
183
27
    such as expanding/collapsing items (when used together with the Expandable item).
184
28
    It provides features like automatically positioning the expanding item when it
185
29
    expands and collapsing it again when the user taps outside of it.
186
30
187
31
    Examples:
188
32
    \qml
189
33
        import Ubuntu.Components 0.1
190
34
        import Ubuntu.Components.ListItems 0.1 as ListItem
191
35
192
36
        Item {
193
37
            ListModel {
194
38
                id: listModel
195
39
            }
196
40
197
41
            UbuntuListView {
198
42
                id: ubuntuListView
199
43
                anchors { left: parent.left; right: parent.right }
200
44
                height: units.gu(24)
201
45
                model: listModel
202
46
203
47
                delegate: ListItem.Expandable {
204
48
                    id: expandingItem
205
49
206
50
                    expandedHeight: units.gu(30)
207
51
208
52
                    onClicked: {
209
53
                        ubuntuListView.expandedIndex = index;
210
54
                    }
211
55
                }
212
56
            }
213
57
        }
214
58
    \endqml
215
59
216
60
    \b{This component is under heavy development.}
217
61
*/
218
62
219
63
ListView {
220
64
    id: root
221
65
222
66
    /*!
223
67
      The index of the currently expanded item. -1 if no item is expanded.
224
68
     */
225
69
    property int expandedIndex: -1
226
70
227
71
    QtObject {
228
72
        id: priv
229
73
230
74
        function positionViewAtIndexAnimated(expandedIndex) {
231
75
            animation.from = root.contentY;
232
76
            root.currentIndex = expandedIndex;
233
77
            if (expandedIndex == root.count - 1) {
234
78
                root.positionViewAtIndex(expandedIndex, ListView.End);
235
79
            } else {
236
80
                root.positionViewAtIndex(expandedIndex + 1, ListView.End);
237
81
            }
238
82
239
83
            var effectiveExpandedHeight = Math.min(root.currentItem.expandedHeight, root.height - root.currentItem.collapsedHeight);
240
84
            if (root.contentY - root.originY == 0) {
241
85
                if (((root.currentIndex + 1) * root.currentItem.collapsedHeight) + effectiveExpandedHeight > root.height) {
242
86
                    animation.to = ((root.currentIndex + 1) * root.currentItem.collapsedHeight + effectiveExpandedHeight) - root.height + root.originY
243
87
                } else {
244
88
                    animation.to = root.originY
245
89
                }
246
90
            } else {
247
91
                animation.to = root.contentY + (effectiveExpandedHeight - root.currentItem.collapsedHeight);
248
92
            }
249
93
            animation.start();
250
94
        }
251
95
    }
252
96
253
97
    /*!
254
98
      \preliminary
255
99
      Expand the item at the given index.
256
100
     */
257
101
    onExpandedIndexChanged: {
258
102
        if (expandedIndex < 0) {
259
103
            return;
260
104
        }
261
105
        priv.positionViewAtIndexAnimated(expandedIndex, ListView.End)
262
106
    }
263
107
264
108
    UbuntuNumberAnimation {
265
109
        id: animation
266
110
        target: root
267
111
        property: "contentY"
268
112
    }
269
113
270
114
    MouseArea {
271
115
        parent: contentItem
272
116
        anchors.fill: parent
273
117
        z: 2
274
118
        enabled: root.expandedIndex != -1
275
119
        onClicked: root.expandedIndex = -1;
276
120
    }
277
121
}
278
0
122
279
=== modified file 'modules/Ubuntu/Components/qmldir'
280
--- modules/Ubuntu/Components/qmldir	2014-01-21 18:27:23 +0000
281
+++ modules/Ubuntu/Components/qmldir	2014-02-26 09:47:24 +0000
282
@@ -43,6 +43,7 @@
283
43
StyledItem 0.1 StyledItem.qml
43
StyledItem 0.1 StyledItem.qml
284
44
ColorUtils 0.1 colorUtils.js
44
ColorUtils 0.1 colorUtils.js
285
45
DateUtils 0.1 dateUtils.js
45
DateUtils 0.1 dateUtils.js
286
46
UbuntuListView 0.1 UbuntuListView.qml
287
46
47
288
47
internal TextCursor TextCursor.qml
48
internal TextCursor TextCursor.qml
289
48
internal TextInputPopover TextInputPopover.qml
49
internal TextInputPopover TextInputPopover.qml
290
49
50
291
=== modified file 'modules/Ubuntu/Test/UbuntuTestCase.qml'
292
--- modules/Ubuntu/Test/UbuntuTestCase.qml	2014-02-19 10:49:07 +0000
293
+++ modules/Ubuntu/Test/UbuntuTestCase.qml	2014-02-26 09:47:24 +0000
294
@@ -29,6 +29,9 @@
295
29
    This class extends the default QML TestCase class which is available in QtTest 1.0.
29
    This class extends the default QML TestCase class which is available in QtTest 1.0.
296
30
*/
30
*/
297
31
TestCase {
31
TestCase {
298
32
	TestUtil {
299
33
		id:util
300
34
	}
301
32
35
302
33
	/*!
36
	/*!
303
34
		Find a child from the item based on the objectName.
37
		Find a child from the item based on the objectName.
304
@@ -83,5 +86,37 @@
305
83
			mouseMove(item,x + ix,y + iy,stepdelay);
86
			mouseMove(item,x + ix,y + iy,stepdelay);
306
84
		}
87
		}
307
85
	}
88
	}
308
89
309
90
	/*!
310
91
		Keeps executing a given parameter-less function until it returns the given
311
92
		expected result or the timemout is reached (in which case a test failure
312
93
		is generated)
313
94
	*/
314
95
315
96
	function tryCompareFunction(func, expectedResult, timeout) {
316
97
		var timeSpent = 0
317
98
		var success = false
318
99
		var actualResult
319
100
		if (timeout == undefined) {
320
101
                    timeout = 5000;
321
102
                }
322
103
		while (timeSpent < timeout && !success) {
323
104
			actualResult = func()
324
105
			success = qtest_compareInternal(actualResult, expectedResult)
325
106
			if (success === false) {
326
107
				wait(50)
327
108
				timeSpent += 50
328
109
			}
329
110
		}
330
111
331
112
		var act = qtest_results.stringify(actualResult)
332
113
		var exp = qtest_results.stringify(expectedResult)
333
114
		if (!qtest_results.compare(success,
334
115
				"function returned unexpected result",
335
116
				act, exp,
336
117
				util.callerFile(), util.callerLine())) {
337
118
			throw new Error("QtQuickTest::fail")
338
119
		}
339
120
	}
340
86
} 
121
} 
341
87
122
342
88
123
343
=== added file 'tests/unit_x11/tst_components/tst_ubuntulistview.qml'
344
--- tests/unit_x11/tst_components/tst_ubuntulistview.qml	1970-01-01 00:00:00 +0000
345
+++ tests/unit_x11/tst_components/tst_ubuntulistview.qml	2014-02-26 09:47:24 +0000
346
@@ -0,0 +1,198 @@
347
1
/*
348
2
 * Copyright 2014 Canonical Ltd.
349
3
 *
350
4
 * This program is free software; you can redistribute it and/or modify
351
5
 * it under the terms of the GNU Lesser General Public License as published by
352
6
 * the Free Software Foundation; version 3.
353
7
 *
354
8
 * This program is distributed in the hope that it will be useful,
355
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
356
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
357
11
 * GNU Lesser General Public License for more details.
358
12
 *
359
13
 * You should have received a copy of the GNU Lesser General Public License
360
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
361
15
 */
362
16
363
17
import QtQuick 2.0
364
18
import QtTest 1.0
365
19
import Ubuntu.Test 0.1
366
20
import Ubuntu.Components 0.1
367
21
import Ubuntu.Components.ListItems 0.1
368
22
369
23
Item {
370
24
    width: units.gu(40)
371
25
    height: units.gu(60)
372
26
373
27
    ListModel {
374
28
        id: dummyModel
375
29
        Component.onCompleted: {
376
30
            for (var i = 0; i < 20; ++i) {
377
31
                dummyModel.append({idx: i});
378
32
            }
379
33
        }
380
34
    }
381
35
382
36
    UbuntuListView {
383
37
        id: ubuntuListView
384
38
        anchors { left: parent.left; top: parent.top; right: parent.right }
385
39
        height: units.gu(20)
386
40
        clip: true
387
41
        model: dummyModel
388
42
389
43
        delegate: Expandable {
390
44
            id: expandable
391
45
            objectName: "expandable" + index
392
46
            expandedHeight: contentColumn.height
393
47
394
48
            onClicked: ubuntuListView.expandedIndex = index
395
49
396
50
            Column {
397
51
                id: contentColumn
398
52
                anchors { left: parent.left; right: parent.right; top: parent.top }
399
53
                Rectangle {
400
54
                    anchors { left: parent.left; right: parent.right}
401
55
                    id: collapsedRect
402
56
                    color: index % 2 == 0 ? "khaki" : "blue"
403
57
                    height: expandable.collapsedHeight
404
58
                }
405
59
                Rectangle {
406
60
                    anchors { left: parent.left; right: parent.right }
407
61
                    height: units.gu(40)
408
62
                    color: "orange"
409
63
                }
410
64
            }
411
65
        }
412
66
    }
413
67
414
68
    UbuntuTestCase {
415
69
        name: "UbuntuListView"
416
70
        when: windowShown
417
71
418
72
        function initTestCase() {
419
73
            tryCompare(dummyModel, "count", 20);
420
74
        }
421
75
422
76
        function init() {
423
77
            waitForRendering(ubuntuListView);
424
78
        }
425
79
426
80
        function expandItem(item) {
427
81
            var index = ubuntuListView.indexAt(item.x, item.y);
428
82
            ubuntuListView.expandedIndex = index;
429
83
            var targetHeight = Math.min(item.expandedHeight, ubuntuListView.height - item.collapsedHeight);
430
84
            tryCompare(item, "height", targetHeight);
431
85
        }
432
86
433
87
        function collapse() {
434
88
            if (ubuntuListView.expandedIndex == -1) {
435
89
                return;
436
90
            }
437
91
438
92
            var expandedItem = findChild(ubuntuListView, "expandable" + ubuntuListView.expandedIndex);
439
93
            ubuntuListView.expandedIndex = -1;
440
94
            tryCompare(expandedItem, "height", expandedItem.collapsedHeight);
441
95
        }
442
96
443
97
        function test_expandedItem() {
444
98
            var item = findChild(ubuntuListView, "expandable1");
445
99
            expandItem(item);
446
100
447
101
            // expandedItem needs to point to the expanded item
448
102
            compare(ubuntuListView.expandedIndex, 1);
449
103
            // item must be expanded now
450
104
            compare(item.expanded, true);
451
105
452
106
            collapse();
453
107
454
108
            // expandedItem must be unset after collapsing
455
109
            compare(ubuntuListView.expandedIndex, -1);
456
110
        }
457
111
458
112
        function test_noScrollingNeeded() {
459
113
            var item = findChild(ubuntuListView, "expandable1");
460
114
            fuzzyCompare(ubuntuListView.mapFromItem(item).y, item.collapsedHeight, .5);
461
115
462
116
            expandItem(item);
463
117
            waitForRendering(ubuntuListView);
464
118
465
119
            fuzzyCompare(ubuntuListView.mapFromItem(item).y, item.collapsedHeight, .5);
466
120
        }
467
121
468
122
        function test_scrollToTop() {
469
123
            ubuntuListView.height = units.gu(30);
470
124
            ubuntuListView.positionViewAtIndex(0, ListView.Beginning)
471
125
472
126
            var item = findChild(ubuntuListView, "expandable1");
473
127
            fuzzyCompare(ubuntuListView.mapFromItem(item).y, item.collapsedHeight, 1);
474
128
475
129
            expandItem(item);
476
130
477
131
            fuzzyCompare(ubuntuListView.mapFromItem(item).y, 0, .5);
478
132
        }
479
133
480
134
        function test_scrollIntoView() {
481
135
            var item = findChild(ubuntuListView, "expandable9");
482
136
            expandItem(item);
483
137
            waitForRendering(ubuntuListView);
484
138
485
139
            // The item must be scrolled upwards, leaving space for one other item at the bottom
486
140
            fuzzyCompare(ubuntuListView.mapFromItem(item).y, ubuntuListView.height - item.collapsedHeight - item.expandedHeight, 1);
487
141
        }
488
142
489
143
        function test_collapseByClickingOutside() {
490
144
            // expand item 0
491
145
            var item = findChild(ubuntuListView, "expandable0");
492
146
            expandItem(item);
493
147
494
148
            // click on item 1
495
149
            var item1 = findChild(ubuntuListView, "expandable1");
496
150
            mouseClick(item1, item1.width / 2, item1.height / 2);
497
151
498
152
            // make sure item1 is collapsed
499
153
            tryCompare(item, "expanded", false);
500
154
        }
501
155
502
156
        function test_dimOthers() {
503
157
            var item = findChild(ubuntuListView, "expandable1");
504
158
            expandItem(item);
505
159
506
160
            for (var i = 0; i < ubuntuListView.contentItem.children.length; ++i) {
507
161
                var childItem = ubuntuListView.contentItem.children[i];
508
162
                if (childItem.hasOwnProperty("expanded")) {
509
163
                    compare(childItem.opacity, childItem.expanded ? 1 : .5)
510
164
                }
511
165
512
166
            }
513
167
        }
514
168
515
169
        function test_destroyAndRecreateExpanded() {
516
170
            var item = findChild(ubuntuListView, "expandable1");
517
171
            expandItem(item);
518
172
519
173
            // scroll the list to the bottom
520
174
            ubuntuListView.currentIndex = 0;
521
175
            ubuntuListView.positionViewAtIndex(ubuntuListView.count -1, ListView.End);
522
176
523
177
            // make sure the item is eventually destroyed
524
178
            tryCompareFunction(function() { return findChild(ubuntuListView, "expandable1") == null;}, true)
525
179
526
180
            // scroll the list back up
527
181
            ubuntuListView.positionViewAtIndex(0, ListView.Beginning)
528
182
529
183
            // wait until the item is recreated.
530
184
            tryCompareFunction(function() { return findChild(ubuntuListView, "expandable1") != null; }, true);
531
185
            item = findChild(ubuntuListView, "expandable1");
532
186
            compare(item.expanded, true);
533
187
            
534
188
        }
535
189
536
190
        function cleanup() {
537
191
            // Restore listview height
538
192
            ubuntuListView.height = units.gu(60);
539
193
            collapse();
540
194
            // scroll the ListView back to top
541
195
            ubuntuListView.positionViewAtIndex(0, ListView.Beginning);
542
196
        }
543
197
    }
544
198
}
Reviewer	Review Type	Date Requested	Status
Zsombor Egri		2014-02-13	Approve on 2014-02-26
PS Jenkins bot	continuous-integration		Approve on 2014-02-26
Review via email: mp+206161@code.launchpad.net