44444ad · unity8 · git.iko.soy

plugins/ListViewWithPageHeader/listviewwithpageheader.cpp+1−1

@@ -806,7 +806,7 @@ void ListViewWithPageHeader::onModelUpdated(const QQuickChangeSet &changeSet, bo

806 Q_FOREACH(const QQuickChangeSet::Insert &insert, changeSet.inserts()) {

807// qDebug() << "ListViewWithPageHeader::onModelUpdated Insert" << insert.index << insert.count;

808 const bool insertingInValidIndexes = insert.index > m_firstVisibleIndex && insert.index < m_firstVisibleIndex + m_visibleItems.count();

809− const bool firstItemWithViewOnTop = insert.index == 0 && m_firstVisibleIndex == 0 && m_visibleItems.first()->y() + m_clipItem->y() > contentY();

809+ const bool firstItemWithViewOnTop = insert.index == 0 && m_firstVisibleIndex == 0 && !m_visibleItems.isEmpty() && m_visibleItems.first()->y() + m_clipItem->y() > contentY();

810 if (insertingInValidIndexes || firstItemWithViewOnTop)

811 {

812 // If the items we are adding won't be really visible

tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp+19

@@ -991,6 +991,25 @@ private Q_SLOTS:

991 QCOMPARE(lvwph->m_headerItemShownHeight, 50.);

992 }

993

994+ void testInsertToEmpty()

995+ {

996+ QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 0), Q_ARG(QVariant, 6));

997+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 0);

998+ QCOMPARE(lvwph->m_minYExtent, 0.);

999+ QCOMPARE(lvwph->m_clipItem->y(), 0.);

1000+ QCOMPARE(lvwph->m_clipItem->clip(), false);

1001+ QCOMPARE(lvwph->m_headerItem->y(), 0.);

1002+ QCOMPARE(lvwph->m_headerItem->height(), 50.);

1003+ QCOMPARE(lvwph->contentY(), 0.);

1004+

1005+ QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 0), Q_ARG(QVariant, 100));

1006+ QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 0), Q_ARG(QVariant, 125));

1007+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 2);

1008+ QCOMPARE(lvwph->m_firstVisibleIndex, 0);

1009+ verifyItem(0, 50., 125., false);

1010+ verifyItem(1, 175., 100., false);

1011+ }

1012+

994 void testRemoveItemsAtTop()

1013 void testRemoveItemsAtTop()

995 {

1014 {

996 QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 0), Q_ARG(QVariant, 2));

1015 QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 0), Q_ARG(QVariant, 2));

tests/plugins/ListViewWithPageHeader/listviewwithpageheadertestsection.cpp+19

@@ -1121,6 +1121,25 @@ private Q_SLOTS:

1121 QCOMPARE(lvwph->m_topSectionItem->y(), -23.);

1122 }

1123

1124+ void testInsertToEmpty()

1125+ {

1126+ QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 0), Q_ARG(QVariant, 6));

1127+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 0);

1128+ QCOMPARE(lvwph->m_minYExtent, 0.);

1129+ QCOMPARE(lvwph->m_clipItem->y(), 0.);

1130+ QCOMPARE(lvwph->m_clipItem->clip(), false);

1131+ QCOMPARE(lvwph->m_headerItem->y(), 0.);

1132+ QCOMPARE(lvwph->m_headerItem->height(), 50.);

1133+ QCOMPARE(lvwph->contentY(), 0.);

1134+

1135+ QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 0), Q_ARG(QVariant, 100), Q_ARG(QVariant, "Agressive"));

1136+ QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 1), Q_ARG(QVariant, 125), Q_ARG(QVariant, "Regular"));

1137+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 2);

1138+ QCOMPARE(lvwph->m_firstVisibleIndex, 0);

1139+ verifyItem(0, 50., 140., false, "Agressive", false);

1140+ verifyItem(1, 190., 165., false, "Regular", false);

1141+ }

1142+

1124 void testRemoveItemsAtTop()

1143 void testRemoveItemsAtTop()

1125 {

1144 {

1126 QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 0), Q_ARG(QVariant, 2));

1145 QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 0), Q_ARG(QVariant, 2));