Merge lp:~aacid/unity8/dashSectionDelegateUpdateFix into lp:unity8
- dashSectionDelegateUpdateFix
- Merge into trunk
Proposed by
Albert Astals Cid
| Status: | Merged |
|---|---|
| Approved by: | Michael Zanetti |
| Approved revision: | 2657 |
| Merged at revision: | 2680 |
| Proposed branch: | lp:~aacid/unity8/dashSectionDelegateUpdateFix |
| Merge into: | lp:unity8 |
| Diff against target: |
569 lines (+62/-71) 4 files modified
plugins/Dash/listviewwithpageheader.cpp (+4/-12) qml/Dash/GenericScopeView.qml (+1/-2) tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp (+3/-3) tests/plugins/Dash/listviewwithpageheadersectiontest.cpp (+54/-54) |
| To merge this branch: | bzr merge lp:~aacid/unity8/dashSectionDelegateUpdateFix |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michael Zanetti (community) | Approve | ||
| Paweł Stołowski (community) | Approve | ||
| Unity8 CI Bot | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
Improve LVWPH <-> GenericScopeView interaction
Send up directly the delegate instead of the delegateIndex and then asking back for the delegate
Saves time and also if the delegateIndex is the same number but the delegate different the delegate won't be updated because QML doesn't know it's different
Description of the change
* Are there any related MPs required for this MP to build/function as expected?
No
* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A
* If you changed the UI, has there been a design review?
N/A
To post a comment you must log in.
Revision history for this message
| Unity8 CI Bot (unity8-ci-bot) wrote : | # |
review:
Needs Fixing
(continuous-integration)
- 2657. By Albert Astals Cid
-
item() function is still needed on other parts of GenericScopeView ^_^
Revision history for this message
| Unity8 CI Bot (unity8-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:2657
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
review:
Approve
(continuous-integration)
Revision history for this message
| Paweł Stołowski (stolowski) wrote : | # |
I've tested the resulting debs for this MP and I can't reproduce the issue with it anymore, thanks! +1 from me.
review:
Approve
Revision history for this message
| Michael Zanetti (mzanetti) wrote : | # |
Code looks sane to me
* tested by Pawel
* CI is happy too
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'plugins/Dash/listviewwithpageheader.cpp' | |||
| 2 | --- plugins/Dash/listviewwithpageheader.cpp 2016-09-22 07:35:29 +0000 | |||
| 3 | +++ plugins/Dash/listviewwithpageheader.cpp 2016-10-06 10:54:33 +0000 | |||
| 4 | @@ -772,7 +772,7 @@ | |||
| 5 | 772 | delete nobj; | 772 | delete nobj; |
| 6 | 773 | } else { | 773 | } else { |
| 7 | 774 | sectionItem->setProperty("text", sectionText); | 774 | sectionItem->setProperty("text", sectionText); |
| 9 | 775 | sectionItem->setProperty("delegateIndex", -1); | 775 | sectionItem->setProperty("delegate", QVariant()); |
| 10 | 776 | sectionItem->setZ(2); | 776 | sectionItem->setZ(2); |
| 11 | 777 | QQml_setParent_noEvent(sectionItem, m_clipItem); | 777 | QQml_setParent_noEvent(sectionItem, m_clipItem); |
| 12 | 778 | sectionItem->setParentItem(m_clipItem); | 778 | sectionItem->setParentItem(m_clipItem); |
| 13 | @@ -929,7 +929,7 @@ | |||
| 14 | 929 | polish(); | 929 | polish(); |
| 15 | 930 | } | 930 | } |
| 16 | 931 | if (listItem->sectionItem()) { | 931 | if (listItem->sectionItem()) { |
| 18 | 932 | listItem->sectionItem()->setProperty("delegateIndex", modelIndex); | 932 | listItem->sectionItem()->setProperty("delegate", QVariant::fromValue(listItem->m_item)); |
| 19 | 933 | } | 933 | } |
| 20 | 934 | adjustMinYExtent(); | 934 | adjustMinYExtent(); |
| 21 | 935 | m_contentHeightDirty = true; | 935 | m_contentHeightDirty = true; |
| 22 | @@ -1123,7 +1123,7 @@ | |||
| 23 | 1123 | for (int i = 0; i < m_visibleItems.count(); ++i) { | 1123 | for (int i = 0; i < m_visibleItems.count(); ++i) { |
| 24 | 1124 | ListItem *item = m_visibleItems[i]; | 1124 | ListItem *item = m_visibleItems[i]; |
| 25 | 1125 | if (item->sectionItem()) { | 1125 | if (item->sectionItem()) { |
| 27 | 1126 | item->sectionItem()->setProperty("delegateIndex", m_firstVisibleIndex + i); | 1126 | item->sectionItem()->setProperty("delegate", QVariant::fromValue(item->m_item)); |
| 28 | 1127 | } | 1127 | } |
| 29 | 1128 | } | 1128 | } |
| 30 | 1129 | 1129 | ||
| 31 | @@ -1297,15 +1297,7 @@ | |||
| 32 | 1297 | 1297 | ||
| 33 | 1298 | QQuickItemPrivate::get(m_topSectionItem)->setCulled(false); | 1298 | QQuickItemPrivate::get(m_topSectionItem)->setCulled(false); |
| 34 | 1299 | m_topSectionItem->setY(topSectionStickPos); | 1299 | m_topSectionItem->setY(topSectionStickPos); |
| 44 | 1300 | int delegateIndex = modelIndex; | 1300 | m_topSectionItem->setProperty("delegate", QVariant::fromValue(item->m_item)); |
| 36 | 1301 | // Look for the first index with this section text | ||
| 37 | 1302 | while (delegateIndex > 0) { | ||
| 38 | 1303 | const QString prevSection = m_delegateModel->stringValue(delegateIndex - 1, m_sectionProperty); | ||
| 39 | 1304 | if (prevSection != section) | ||
| 40 | 1305 | break; | ||
| 41 | 1306 | delegateIndex--; | ||
| 42 | 1307 | } | ||
| 43 | 1308 | m_topSectionItem->setProperty("delegateIndex", delegateIndex); | ||
| 45 | 1309 | if (item->sectionItem()) { | 1301 | if (item->sectionItem()) { |
| 46 | 1310 | QQuickItemPrivate::get(item->sectionItem())->setCulled(true); | 1302 | QQuickItemPrivate::get(item->sectionItem())->setCulled(true); |
| 47 | 1311 | } | 1303 | } |
| 48 | 1312 | 1304 | ||
| 49 | === modified file 'qml/Dash/GenericScopeView.qml' | |||
| 50 | --- qml/Dash/GenericScopeView.qml 2016-09-22 07:37:21 +0000 | |||
| 51 | +++ qml/Dash/GenericScopeView.qml 2016-10-06 10:54:33 +0000 | |||
| 52 | @@ -623,8 +623,7 @@ | |||
| 53 | 623 | sectionProperty: "name" | 623 | sectionProperty: "name" |
| 54 | 624 | sectionDelegate: ListItems.Header { | 624 | sectionDelegate: ListItems.Header { |
| 55 | 625 | objectName: "dashSectionHeader" + (delegate ? delegate.category : "") | 625 | objectName: "dashSectionHeader" + (delegate ? delegate.category : "") |
| 58 | 626 | property int delegateIndex: -1 | 626 | property var delegate: null |
| 57 | 627 | readonly property var delegate: categoryView.item(delegateIndex) | ||
| 59 | 628 | width: categoryView.width | 627 | width: categoryView.width |
| 60 | 629 | height: text != "" ? units.gu(5) : 0 | 628 | height: text != "" ? units.gu(5) : 0 |
| 61 | 630 | color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText | 629 | color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText |
| 62 | 631 | 630 | ||
| 63 | === modified file 'tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp' | |||
| 64 | --- tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp 2016-06-27 18:44:41 +0000 | |||
| 65 | +++ tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp 2016-10-06 10:54:33 +0000 | |||
| 66 | @@ -82,7 +82,7 @@ | |||
| 67 | 82 | QCOMPARE(section(lvwph->m_visibleItems[visibleIndex]->sectionItem()), sectionHeader); | 82 | QCOMPARE(section(lvwph->m_visibleItems[visibleIndex]->sectionItem()), sectionHeader); |
| 68 | 83 | if (!sectionHeader.isNull()) { | 83 | if (!sectionHeader.isNull()) { |
| 69 | 84 | QCOMPARE(QQuickItemPrivate::get(lvwph->m_visibleItems[visibleIndex]->sectionItem())->culled, sectionHeaderCulled); | 84 | QCOMPARE(QQuickItemPrivate::get(lvwph->m_visibleItems[visibleIndex]->sectionItem())->culled, sectionHeaderCulled); |
| 71 | 85 | QCOMPARE(sectionDelegateIndex(lvwph->m_visibleItems[visibleIndex]->sectionItem()), lvwph->m_firstVisibleIndex + visibleIndex); | 85 | QCOMPARE(sectionDelegate(lvwph->m_visibleItems[visibleIndex]->sectionItem()), lvwph->m_visibleItems[visibleIndex]->m_item); |
| 72 | 86 | } | 86 | } |
| 73 | 87 | } | 87 | } |
| 74 | 88 | 88 | ||
| 75 | @@ -151,9 +151,9 @@ | |||
| 76 | 151 | return item ? item->property("text").toString() : QString(); | 151 | return item ? item->property("text").toString() : QString(); |
| 77 | 152 | } | 152 | } |
| 78 | 153 | 153 | ||
| 80 | 154 | int sectionDelegateIndex(QQuickItem *item) | 154 | QQuickItem *sectionDelegate(QQuickItem *item) |
| 81 | 155 | { | 155 | { |
| 83 | 156 | return item ? item->property("delegateIndex").toInt() : -1; | 156 | return item ? item->property("delegate").value<QQuickItem *>() : nullptr; |
| 84 | 157 | } | 157 | } |
| 85 | 158 | 158 | ||
| 86 | 159 | private Q_SLOTS: | 159 | private Q_SLOTS: |
| 87 | 160 | 160 | ||
| 88 | === modified file 'tests/plugins/Dash/listviewwithpageheadersectiontest.cpp' | |||
| 89 | --- tests/plugins/Dash/listviewwithpageheadersectiontest.cpp 2016-06-27 18:44:41 +0000 | |||
| 90 | +++ tests/plugins/Dash/listviewwithpageheadersectiontest.cpp 2016-10-06 10:54:33 +0000 | |||
| 91 | @@ -39,7 +39,7 @@ | |||
| 92 | 39 | QCOMPARE(section(lvwph->m_visibleItems[visibleIndex]->sectionItem()), sectionHeader); | 39 | QCOMPARE(section(lvwph->m_visibleItems[visibleIndex]->sectionItem()), sectionHeader); |
| 93 | 40 | if (!sectionHeader.isNull()) { | 40 | if (!sectionHeader.isNull()) { |
| 94 | 41 | QCOMPARE(QQuickItemPrivate::get(lvwph->m_visibleItems[visibleIndex]->sectionItem())->culled, sectionHeaderCulled); | 41 | QCOMPARE(QQuickItemPrivate::get(lvwph->m_visibleItems[visibleIndex]->sectionItem())->culled, sectionHeaderCulled); |
| 96 | 42 | QCOMPARE(sectionDelegateIndex(lvwph->m_visibleItems[visibleIndex]->sectionItem()), lvwph->m_firstVisibleIndex + visibleIndex); | 42 | QCOMPARE(sectionDelegate(lvwph->m_visibleItems[visibleIndex]->sectionItem()), lvwph->m_visibleItems[visibleIndex]->m_item); |
| 97 | 43 | } | 43 | } |
| 98 | 44 | } | 44 | } |
| 99 | 45 | 45 | ||
| 100 | @@ -116,9 +116,9 @@ | |||
| 101 | 116 | return item ? item->property("text").toString() : QString(); | 116 | return item ? item->property("text").toString() : QString(); |
| 102 | 117 | } | 117 | } |
| 103 | 118 | 118 | ||
| 105 | 119 | int sectionDelegateIndex(QQuickItem *item) const | 119 | QQuickItem *sectionDelegate(QQuickItem *item) const |
| 106 | 120 | { | 120 | { |
| 108 | 121 | return item ? item->property("delegateIndex").toInt() : -1; | 121 | return item ? item->property("delegate").value<QQuickItem *>() : nullptr; |
| 109 | 122 | } | 122 | } |
| 110 | 123 | 123 | ||
| 111 | 124 | private Q_SLOTS: | 124 | private Q_SLOTS: |
| 112 | @@ -220,7 +220,7 @@ | |||
| 113 | 220 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 220 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 114 | 221 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 221 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 115 | 222 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Regular")); | 222 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Regular")); |
| 117 | 223 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 1); | 223 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 118 | 224 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 224 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 119 | 225 | } | 225 | } |
| 120 | 226 | 226 | ||
| 121 | @@ -242,7 +242,7 @@ | |||
| 122 | 242 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 242 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 123 | 243 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 243 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 124 | 244 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); | 244 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); |
| 126 | 245 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 2); | 245 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 127 | 246 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 246 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 128 | 247 | } | 247 | } |
| 129 | 248 | 248 | ||
| 130 | @@ -264,7 +264,7 @@ | |||
| 131 | 264 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 264 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 132 | 265 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 265 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 133 | 266 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Agressive")); | 266 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Agressive")); |
| 135 | 267 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 0); | 267 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[0]->m_item); |
| 136 | 268 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 268 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 137 | 269 | 269 | ||
| 138 | 270 | changeContentY(-30); | 270 | changeContentY(-30); |
| 139 | @@ -283,7 +283,7 @@ | |||
| 140 | 283 | QCOMPARE(lvwph->m_headerItemShownHeight, 30.); | 283 | QCOMPARE(lvwph->m_headerItemShownHeight, 30.); |
| 141 | 284 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 284 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 142 | 285 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Agressive")); | 285 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Agressive")); |
| 144 | 286 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 0); | 286 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[0]->m_item); |
| 145 | 287 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 287 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 146 | 288 | } | 288 | } |
| 147 | 289 | 289 | ||
| 148 | @@ -339,7 +339,7 @@ | |||
| 149 | 339 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 339 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 150 | 340 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 340 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 151 | 341 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Regular")); | 341 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Regular")); |
| 153 | 342 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 1); | 342 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 154 | 343 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 343 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 155 | 344 | 344 | ||
| 156 | 345 | lvwph->positionAtBeginning(); | 345 | lvwph->positionAtBeginning(); |
| 157 | @@ -365,7 +365,7 @@ | |||
| 158 | 365 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 365 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 159 | 366 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 366 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 160 | 367 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); | 367 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); |
| 162 | 368 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 2); | 368 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 163 | 369 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 369 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 164 | 370 | 370 | ||
| 165 | 371 | lvwph->positionAtBeginning(); | 371 | lvwph->positionAtBeginning(); |
| 166 | @@ -410,7 +410,7 @@ | |||
| 167 | 410 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 410 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 168 | 411 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 411 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 169 | 412 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Regular")); | 412 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Regular")); |
| 171 | 413 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 1); | 413 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 172 | 414 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 414 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 173 | 415 | 415 | ||
| 174 | 416 | model->setProperty(0, "size", 400); | 416 | model->setProperty(0, "size", 400); |
| 175 | @@ -430,7 +430,7 @@ | |||
| 176 | 430 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 430 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 177 | 431 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 431 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 178 | 432 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Regular")); | 432 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Regular")); |
| 180 | 433 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 1); | 433 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 181 | 434 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 434 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 182 | 435 | 435 | ||
| 183 | 436 | scrollToTop(); | 436 | scrollToTop(); |
| 184 | @@ -484,7 +484,7 @@ | |||
| 185 | 484 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 484 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 186 | 485 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 485 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 187 | 486 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); | 486 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); |
| 189 | 487 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 2); | 487 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 190 | 488 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 488 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 191 | 489 | 489 | ||
| 192 | 490 | model->setProperty(0, "size", 400); | 490 | model->setProperty(0, "size", 400); |
| 193 | @@ -504,7 +504,7 @@ | |||
| 194 | 504 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 504 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 195 | 505 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 505 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 196 | 506 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); | 506 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); |
| 198 | 507 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 2); | 507 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 199 | 508 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 508 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 200 | 509 | 509 | ||
| 201 | 510 | scrollToTop(); | 510 | scrollToTop(); |
| 202 | @@ -541,7 +541,7 @@ | |||
| 203 | 541 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 541 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 204 | 542 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 542 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 205 | 543 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Bold")); | 543 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Bold")); |
| 207 | 544 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 3); | 544 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 208 | 545 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 545 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 209 | 546 | 546 | ||
| 210 | 547 | changeContentY(-30); | 547 | changeContentY(-30); |
| 211 | @@ -559,7 +559,7 @@ | |||
| 212 | 559 | QCOMPARE(lvwph->m_headerItemShownHeight, 30.); | 559 | QCOMPARE(lvwph->m_headerItemShownHeight, 30.); |
| 213 | 560 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 560 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 214 | 561 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Bold")); | 561 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Bold")); |
| 216 | 562 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 3); | 562 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 217 | 563 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 563 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 218 | 564 | 564 | ||
| 219 | 565 | changeContentY(30); | 565 | changeContentY(30); |
| 220 | @@ -577,7 +577,7 @@ | |||
| 221 | 577 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 577 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 222 | 578 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 578 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 223 | 579 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Bold")); | 579 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Bold")); |
| 225 | 580 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 3); | 580 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 226 | 581 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 581 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 227 | 582 | 582 | ||
| 228 | 583 | changeContentY(-30); | 583 | changeContentY(-30); |
| 229 | @@ -595,7 +595,7 @@ | |||
| 230 | 595 | QCOMPARE(lvwph->m_headerItemShownHeight, 30.); | 595 | QCOMPARE(lvwph->m_headerItemShownHeight, 30.); |
| 231 | 596 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 596 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 232 | 597 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Bold")); | 597 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Bold")); |
| 234 | 598 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 3); | 598 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 235 | 599 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 599 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 236 | 600 | } | 600 | } |
| 237 | 601 | 601 | ||
| 238 | @@ -616,7 +616,7 @@ | |||
| 239 | 616 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 616 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 240 | 617 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 617 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 241 | 618 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Bold")); | 618 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Bold")); |
| 243 | 619 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 3); | 619 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 244 | 620 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 620 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 245 | 621 | 621 | ||
| 246 | 622 | lvwph->setDelegate(otherDelegate); | 622 | lvwph->setDelegate(otherDelegate); |
| 247 | @@ -675,7 +675,7 @@ | |||
| 248 | 675 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 675 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 249 | 676 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 676 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 250 | 677 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Bold")); | 677 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Bold")); |
| 252 | 678 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 3); | 678 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 253 | 679 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 679 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 254 | 680 | 680 | ||
| 255 | 681 | scrollToTop(); | 681 | scrollToTop(); |
| 256 | @@ -714,7 +714,7 @@ | |||
| 257 | 714 | QTRY_VERIFY(lvwph->isAtYEnd()); | 714 | QTRY_VERIFY(lvwph->isAtYEnd()); |
| 258 | 715 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 715 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 259 | 716 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Bold")); | 716 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Bold")); |
| 261 | 717 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 3); | 717 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 262 | 718 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 718 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 263 | 719 | 719 | ||
| 264 | 720 | scrollToTop(); | 720 | scrollToTop(); |
| 265 | @@ -751,7 +751,7 @@ | |||
| 266 | 751 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 751 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 267 | 752 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 752 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 268 | 753 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Agressive")); | 753 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Agressive")); |
| 270 | 754 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 0); | 754 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[0]->m_item); |
| 271 | 755 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 755 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 272 | 756 | } | 756 | } |
| 273 | 757 | 757 | ||
| 274 | @@ -836,7 +836,7 @@ | |||
| 275 | 836 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 836 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 276 | 837 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 837 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 277 | 838 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); | 838 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); |
| 279 | 839 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 2); | 839 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[0]->m_item); |
| 280 | 840 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 840 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 281 | 841 | 841 | ||
| 282 | 842 | QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 1), Q_ARG(QVariant, 100), Q_ARG(QVariant, "Agressive")); | 842 | QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 1), Q_ARG(QVariant, 100), Q_ARG(QVariant, "Agressive")); |
| 283 | @@ -857,7 +857,7 @@ | |||
| 284 | 857 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 857 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 285 | 858 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 858 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 286 | 859 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); | 859 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); |
| 288 | 860 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 4); | 860 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[0]->m_item); |
| 289 | 861 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 861 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 290 | 862 | 862 | ||
| 291 | 863 | scrollToTop(); | 863 | scrollToTop(); |
| 292 | @@ -898,7 +898,7 @@ | |||
| 293 | 898 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 898 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 294 | 899 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 899 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 295 | 900 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Agressive")); | 900 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Agressive")); |
| 297 | 901 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 0); | 901 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[0]->m_item); |
| 298 | 902 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 902 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 299 | 903 | 903 | ||
| 300 | 904 | QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 3), Q_ARG(QVariant, 100), Q_ARG(QVariant, "Agressive")); | 904 | QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 3), Q_ARG(QVariant, 100), Q_ARG(QVariant, "Agressive")); |
| 301 | @@ -919,7 +919,7 @@ | |||
| 302 | 919 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 919 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 303 | 920 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 920 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 304 | 921 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Agressive")); | 921 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Agressive")); |
| 306 | 922 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 0); | 922 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[0]->m_item); |
| 307 | 923 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 923 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 308 | 924 | } | 924 | } |
| 309 | 925 | 925 | ||
| 310 | @@ -942,7 +942,7 @@ | |||
| 311 | 942 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 942 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 312 | 943 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 943 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 313 | 944 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); | 944 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); |
| 315 | 945 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 2); | 945 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 316 | 946 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 946 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 317 | 947 | 947 | ||
| 318 | 948 | QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 1), Q_ARG(QVariant, 100), Q_ARG(QVariant, "Agressive")); | 948 | QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 1), Q_ARG(QVariant, 100), Q_ARG(QVariant, "Agressive")); |
| 319 | @@ -963,7 +963,7 @@ | |||
| 320 | 963 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 963 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 321 | 964 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 964 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 322 | 965 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); | 965 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); |
| 324 | 966 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 4); | 966 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 325 | 967 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 967 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 326 | 968 | } | 968 | } |
| 327 | 969 | 969 | ||
| 328 | @@ -986,7 +986,7 @@ | |||
| 329 | 986 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 986 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 330 | 987 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 987 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 331 | 988 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Regular")); | 988 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Regular")); |
| 333 | 989 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 1); | 989 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 334 | 990 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 990 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 335 | 991 | 991 | ||
| 336 | 992 | QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 1), Q_ARG(QVariant, 100), Q_ARG(QVariant, "Agressive")); | 992 | QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 1), Q_ARG(QVariant, 100), Q_ARG(QVariant, "Agressive")); |
| 337 | @@ -1007,7 +1007,7 @@ | |||
| 338 | 1007 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 1007 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 339 | 1008 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 1008 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 340 | 1009 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Regular")); | 1009 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Regular")); |
| 342 | 1010 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 3); | 1010 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 343 | 1011 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 1011 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 344 | 1012 | 1012 | ||
| 345 | 1013 | scrollToTop(); | 1013 | scrollToTop(); |
| 346 | @@ -1055,7 +1055,7 @@ | |||
| 347 | 1055 | QVERIFY(!lvwph->isAtYEnd()); | 1055 | QVERIFY(!lvwph->isAtYEnd()); |
| 348 | 1056 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 1056 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 349 | 1057 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Bold")); | 1057 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Bold")); |
| 351 | 1058 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 3); | 1058 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 352 | 1059 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 1059 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 353 | 1060 | 1060 | ||
| 354 | 1061 | scrollToBottom(); | 1061 | scrollToBottom(); |
| 355 | @@ -1076,7 +1076,7 @@ | |||
| 356 | 1076 | QVERIFY(lvwph->isAtYEnd()); | 1076 | QVERIFY(lvwph->isAtYEnd()); |
| 357 | 1077 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 1077 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 358 | 1078 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Lazy")); | 1078 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Lazy")); |
| 360 | 1079 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 5); | 1079 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 361 | 1080 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 1080 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 362 | 1081 | } | 1081 | } |
| 363 | 1082 | 1082 | ||
| 364 | @@ -1130,7 +1130,7 @@ | |||
| 365 | 1130 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 1130 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 366 | 1131 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 1131 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 367 | 1132 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Bold")); | 1132 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Bold")); |
| 369 | 1133 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 13); | 1133 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 370 | 1134 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 1134 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 371 | 1135 | 1135 | ||
| 372 | 1136 | changeContentY(-1700); | 1136 | changeContentY(-1700); |
| 373 | @@ -1155,7 +1155,7 @@ | |||
| 374 | 1155 | QCOMPARE(lvwph->m_headerItemShownHeight, 50.); | 1155 | QCOMPARE(lvwph->m_headerItemShownHeight, 50.); |
| 375 | 1156 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 1156 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 376 | 1157 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Regular")); | 1157 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Regular")); |
| 378 | 1158 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 4); | 1158 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[3]->m_item); |
| 379 | 1159 | QCOMPARE(lvwph->m_topSectionItem->y(), -23.); | 1159 | QCOMPARE(lvwph->m_topSectionItem->y(), -23.); |
| 380 | 1160 | } | 1160 | } |
| 381 | 1161 | 1161 | ||
| 382 | @@ -1217,7 +1217,7 @@ | |||
| 383 | 1217 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 1217 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 384 | 1218 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 1218 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 385 | 1219 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Bold")); | 1219 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Bold")); |
| 387 | 1220 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 1); | 1220 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 388 | 1221 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 1221 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 389 | 1222 | } | 1222 | } |
| 390 | 1223 | 1223 | ||
| 391 | @@ -1241,7 +1241,7 @@ | |||
| 392 | 1241 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 1241 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 393 | 1242 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 1242 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 394 | 1243 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); | 1243 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); |
| 396 | 1244 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 2); | 1244 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 397 | 1245 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 1245 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 398 | 1246 | } | 1246 | } |
| 399 | 1247 | 1247 | ||
| 400 | @@ -1264,7 +1264,7 @@ | |||
| 401 | 1264 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 1264 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 402 | 1265 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 1265 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 403 | 1266 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); | 1266 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); |
| 405 | 1267 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 2); | 1267 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 406 | 1268 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 1268 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 407 | 1269 | 1269 | ||
| 408 | 1270 | QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 1), Q_ARG(QVariant, 1)); | 1270 | QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 1), Q_ARG(QVariant, 1)); |
| 409 | @@ -1284,7 +1284,7 @@ | |||
| 410 | 1284 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 1284 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 411 | 1285 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 1285 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 412 | 1286 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); | 1286 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); |
| 414 | 1287 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 1); | 1287 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 415 | 1288 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 1288 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 416 | 1289 | } | 1289 | } |
| 417 | 1290 | 1290 | ||
| 418 | @@ -1307,7 +1307,7 @@ | |||
| 419 | 1307 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 1307 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 420 | 1308 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 1308 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 421 | 1309 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); | 1309 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); |
| 423 | 1310 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 2); | 1310 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 424 | 1311 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 1311 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 425 | 1312 | 1312 | ||
| 426 | 1313 | QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 3), Q_ARG(QVariant, 1)); | 1313 | QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 3), Q_ARG(QVariant, 1)); |
| 427 | @@ -1327,7 +1327,7 @@ | |||
| 428 | 1327 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 1327 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 429 | 1328 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 1328 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 430 | 1329 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); | 1329 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); |
| 432 | 1330 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 2); | 1330 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 433 | 1331 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 1331 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 434 | 1332 | } | 1332 | } |
| 435 | 1333 | 1333 | ||
| 436 | @@ -1407,7 +1407,7 @@ | |||
| 437 | 1407 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 1407 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 438 | 1408 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 1408 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 439 | 1409 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Bold")); | 1409 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Bold")); |
| 441 | 1410 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 3); | 1410 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 442 | 1411 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 1411 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 443 | 1412 | 1412 | ||
| 444 | 1413 | QMetaObject::invokeMethod(model, "moveItems", Q_ARG(QVariant, 0), Q_ARG(QVariant, 5), Q_ARG(QVariant, 1)); | 1413 | QMetaObject::invokeMethod(model, "moveItems", Q_ARG(QVariant, 0), Q_ARG(QVariant, 5), Q_ARG(QVariant, 1)); |
| 445 | @@ -1428,7 +1428,7 @@ | |||
| 446 | 1428 | QVERIFY(!lvwph->isAtYEnd()); | 1428 | QVERIFY(!lvwph->isAtYEnd()); |
| 447 | 1429 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 1429 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 448 | 1430 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Bold")); | 1430 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Bold")); |
| 450 | 1431 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 2); | 1431 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 451 | 1432 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 1432 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 452 | 1433 | } | 1433 | } |
| 453 | 1434 | 1434 | ||
| 454 | @@ -1452,7 +1452,7 @@ | |||
| 455 | 1452 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 1452 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 456 | 1453 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 1453 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 457 | 1454 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); | 1454 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); |
| 459 | 1455 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 2); | 1455 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[2]->m_item); |
| 460 | 1456 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 1456 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 461 | 1457 | 1457 | ||
| 462 | 1458 | model->setProperty(1, "size", 100); | 1458 | model->setProperty(1, "size", 100); |
| 463 | @@ -1473,7 +1473,7 @@ | |||
| 464 | 1473 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 1473 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 465 | 1474 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 1474 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 466 | 1475 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); | 1475 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); |
| 468 | 1476 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 2); | 1476 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[2]->m_item); |
| 469 | 1477 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 1477 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 470 | 1478 | } | 1478 | } |
| 471 | 1479 | 1479 | ||
| 472 | @@ -1512,7 +1512,7 @@ | |||
| 473 | 1512 | QCOMPARE(lvwph->m_headerItemShownHeight, 50.); | 1512 | QCOMPARE(lvwph->m_headerItemShownHeight, 50.); |
| 474 | 1513 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 1513 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 475 | 1514 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Agressive")); | 1514 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Agressive")); |
| 477 | 1515 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 0); | 1515 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[0]->m_item); |
| 478 | 1516 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 1516 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 479 | 1517 | 1517 | ||
| 480 | 1518 | scrollToTop(); | 1518 | scrollToTop(); |
| 481 | @@ -1551,7 +1551,7 @@ | |||
| 482 | 1551 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 1551 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 483 | 1552 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 1552 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 484 | 1553 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Regular")); | 1553 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Regular")); |
| 486 | 1554 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 1); | 1554 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 487 | 1555 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 1555 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 488 | 1556 | 1556 | ||
| 489 | 1557 | lvwph->showHeader(); | 1557 | lvwph->showHeader(); |
| 490 | @@ -1572,7 +1572,7 @@ | |||
| 491 | 1572 | QCOMPARE(lvwph->m_headerItemShownHeight, 50.); | 1572 | QCOMPARE(lvwph->m_headerItemShownHeight, 50.); |
| 492 | 1573 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 1573 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 493 | 1574 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Regular")); | 1574 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Regular")); |
| 495 | 1575 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 1); | 1575 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 496 | 1576 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 1576 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 497 | 1577 | 1577 | ||
| 498 | 1578 | scrollToTop(); | 1578 | scrollToTop(); |
| 499 | @@ -1759,7 +1759,7 @@ | |||
| 500 | 1759 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 1759 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 501 | 1760 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 1760 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 502 | 1761 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Agressive")); | 1761 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Agressive")); |
| 504 | 1762 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 0); | 1762 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 505 | 1763 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 1763 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 506 | 1764 | } | 1764 | } |
| 507 | 1765 | 1765 | ||
| 508 | @@ -1784,7 +1784,7 @@ | |||
| 509 | 1784 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 1784 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 510 | 1785 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 1785 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 511 | 1786 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Regular")); | 1786 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Regular")); |
| 513 | 1787 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 1); | 1787 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 514 | 1788 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 1788 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 515 | 1789 | } | 1789 | } |
| 516 | 1790 | 1790 | ||
| 517 | @@ -1892,7 +1892,7 @@ | |||
| 518 | 1892 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 1892 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 519 | 1893 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 1893 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 520 | 1894 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Regular")); | 1894 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Regular")); |
| 522 | 1895 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 1); | 1895 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[0]->m_item); |
| 523 | 1896 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 1896 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 524 | 1897 | } | 1897 | } |
| 525 | 1898 | 1898 | ||
| 526 | @@ -1914,7 +1914,7 @@ | |||
| 527 | 1914 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 1914 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 528 | 1915 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 1915 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 529 | 1916 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Regular")); | 1916 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Regular")); |
| 531 | 1917 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 1); | 1917 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[0]->m_item); |
| 532 | 1918 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 1918 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 533 | 1919 | 1919 | ||
| 534 | 1920 | bool res = lvwph->maximizeVisibleArea(1); | 1920 | bool res = lvwph->maximizeVisibleArea(1); |
| 535 | @@ -1934,7 +1934,7 @@ | |||
| 536 | 1934 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 1934 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 537 | 1935 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 1935 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 538 | 1936 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Regular")); | 1936 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Regular")); |
| 540 | 1937 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 1); | 1937 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[0]->m_item); |
| 541 | 1938 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 1938 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 542 | 1939 | } | 1939 | } |
| 543 | 1940 | 1940 | ||
| 544 | @@ -1987,7 +1987,7 @@ | |||
| 545 | 1987 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 1987 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 546 | 1988 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 1988 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 547 | 1989 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); | 1989 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Mild")); |
| 549 | 1990 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 2); | 1990 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[1]->m_item); |
| 550 | 1991 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 1991 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 551 | 1992 | } | 1992 | } |
| 552 | 1993 | 1993 | ||
| 553 | @@ -2014,7 +2014,7 @@ | |||
| 554 | 2014 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 2014 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 555 | 2015 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 2015 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 556 | 2016 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Agressive")); | 2016 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Agressive")); |
| 558 | 2017 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 0); | 2017 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[0]->m_item); |
| 559 | 2018 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 2018 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 560 | 2019 | 2019 | ||
| 561 | 2020 | changeContentY(20); | 2020 | changeContentY(20); |
| 562 | @@ -2037,7 +2037,7 @@ | |||
| 563 | 2037 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); | 2037 | QCOMPARE(lvwph->m_headerItemShownHeight, 0.); |
| 564 | 2038 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); | 2038 | QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled); |
| 565 | 2039 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Agressive")); | 2039 | QCOMPARE(section(lvwph->m_topSectionItem), QString("Agressive")); |
| 567 | 2040 | QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 0); | 2040 | QCOMPARE(sectionDelegate(lvwph->m_topSectionItem), lvwph->m_visibleItems[0]->m_item); |
| 568 | 2041 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); | 2041 | QCOMPARE(lvwph->m_topSectionItem->y(), 0.); |
| 569 | 2042 | } | 2042 | } |
| 570 | 2043 | 2043 | ||
FAILED: Continuous integration, rev:2656
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
UNSTABLE: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/