git.iko.soy/unity8
on xenial help sign in
Fix last todo in the test section
commit5fc7ed6b948758ccc9f5f45d01440726111fcb41 authorAlbert Astals <albert.astals@canonical.com> dateThu 20 Jun 2013, 09:37 (13 years ago) parent60e5802
2 files changed+41−35
compare with xenial
unifiedsplit
plugins/ListViewWithPageHeader/listviewwithpageheader.cpp+3 tests/plugins/ListViewWithPageHeader/listviewwithpageheadertestsection.cpp+38−35
plugins/ListViewWithPageHeader/listviewwithpageheader.cpp+3
@@ -200,6 +200,9 @@ void ListViewWithPageHeader::setDelegate(QQmlComponent *delegate)
200200 adjustMinYExtent();
201201 setContentY(0);
202202 m_clipItem->setY(0);
203+ if (m_topSectionItem) {
204+ QQuickItemPrivate::get(m_topSectionItem)->setCulled(true);
205+ }
203206
204207 m_delegateModel->setDelegate(delegate);
205208
tests/plugins/ListViewWithPageHeader/listviewwithpageheadertestsection.cpp+38−35
@@ -575,41 +575,44 @@ private Q_SLOTS:
575575 QCOMPARE(lvwph->m_topSectionItem->y(), 0.);
576576 }
577577
578− // TODO
579−// void testChangeDelegateAtBottom()
580−// {
581−// scrollToBottom();
582−// QTRY_COMPARE(lvwph->m_visibleItems.count(), 3);
583−// QCOMPARE(lvwph->m_firstVisibleIndex, 3);
584−// verifyItem(0, -588., 390., true);
585−// verifyItem(1, -198, 350., false);
586−// verifyItem(2, 152, 390., false);
587−// QCOMPARE(lvwph->m_minYExtent, 0.);
588−// QCOMPARE(lvwph->m_clipItem->y(), 1458.);
589−// QCOMPARE(lvwph->m_clipItem->clip(), false);
590−// QCOMPARE(lvwph->m_headerItem->y(), 0.);
591−// QCOMPARE(lvwph->m_headerItem->height(), 50.);
592−// QCOMPARE(lvwph->contentY(), 1458.);
593−// QCOMPARE(lvwph->m_headerItemShownHeight, 0.);
594−//
595−// lvwph->setDelegate(otherDelegate);
596−//
597−// QTRY_COMPARE(lvwph->m_visibleItems.count(), 6);
598−// QCOMPARE(lvwph->m_firstVisibleIndex, 0);
599−// verifyItem(0, 50., 35., false);
600−// verifyItem(1, 85, 35., false);
601−// verifyItem(2, 120, 35., false);
602−// verifyItem(3, 155, 35., false);
603−// verifyItem(4, 190, 35., false);
604−// verifyItem(5, 225, 35., false);
605−// QCOMPARE(lvwph->m_minYExtent, 0.);
606−// QCOMPARE(lvwph->m_clipItem->y(), 0.);
607−// QCOMPARE(lvwph->m_clipItem->clip(), false);
608−// QCOMPARE(lvwph->m_headerItem->y(), 0.);
609−// QCOMPARE(lvwph->m_headerItem->height(), 50.);
610−// QCOMPARE(lvwph->contentY(), 0.);
611−// QCOMPARE(lvwph->m_headerItemShownHeight, 0.);
612−// }
578+ void testChangeDelegateAtBottom()
579+ {
580+ scrollToBottom();
581+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 3);
582+ QCOMPARE(lvwph->m_firstVisibleIndex, 3);
583+ verifyItem(0, -588., 390., true, "Bold", true);
584+ verifyItem(1, -198, 350., false, QString(), true);
585+ verifyItem(2, 152, 390., false, "Lazy", false);
586+ QCOMPARE(lvwph->m_minYExtent, 310.);
587+ QCOMPARE(lvwph->m_clipItem->y(), 1458.);
588+ QCOMPARE(lvwph->m_clipItem->clip(), false);
589+ QCOMPARE(lvwph->m_headerItem->y(), 0.);
590+ QCOMPARE(lvwph->m_headerItem->height(), 50.);
591+ QCOMPARE(lvwph->contentY(), 1458.);
592+ QCOMPARE(lvwph->m_headerItemShownHeight, 0.);
593+ QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled);
594+ QCOMPARE(section(lvwph->m_topSectionItem), QString("Bold"));
595+ QCOMPARE(lvwph->m_topSectionItem->y(), 0.);
596+
597+ lvwph->setDelegate(otherDelegate);
598+
599+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 6);
600+ QCOMPARE(lvwph->m_firstVisibleIndex, 0);
601+ verifyItem(0, 50., 75., false, "Agressive", false);
602+ verifyItem(1, 125, 75., false, "Regular", false);
603+ verifyItem(2, 200, 75., false, "Mild", false);
604+ verifyItem(3, 275, 75., false, "Bold", false);
605+ verifyItem(4, 350, 35., false, QString(), true);
606+ verifyItem(5, 385, 75., false, "Lazy", false);
607+ QCOMPARE(lvwph->m_minYExtent, 0.);
608+ QCOMPARE(lvwph->m_clipItem->y(), 0.);
609+ QCOMPARE(lvwph->m_clipItem->clip(), false);
610+ QCOMPARE(lvwph->m_headerItem->y(), 0.);
611+ QCOMPARE(lvwph->m_headerItem->height(), 50.);
612+ QCOMPARE(lvwph->contentY(), 0.);
613+ QCOMPARE(lvwph->m_headerItemShownHeight, 0.);
614+ QVERIFY(QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled);
615+ }
613616
614617 void testGrowHeaderAtTop()
615618 {