git.iko.soy/unity8
on xenial help sign in
adjustMinYExtent more often
d530374Albert Astals
plugins/ListViewWithPageHeader/listviewwithpageheader.cpp+2−1
compare with xenial
unifiedsplit
@@ -650,8 +650,8 @@ ListViewWithPageHeader::ListItem *ListViewWithPageHeader::createItem(int modelIn
650 }
650 }
651 if (m_firstVisibleIndex < 0 || modelIndex < m_firstVisibleIndex) {
651 if (m_firstVisibleIndex < 0 || modelIndex < m_firstVisibleIndex) {
652 m_firstVisibleIndex = modelIndex;
652 m_firstVisibleIndex = modelIndex;
653− adjustMinYExtent();
654 }
653 }
654+ adjustMinYExtent();
655 }
655 }
656 return listItem;
656 return listItem;
657 }
657 }
@@ -831,6 +831,7 @@ void ListViewWithPageHeader::itemGeometryChanged(QQuickItem *item, const QRectF
831 }
831 }
832 }
832 }
833 refill();
833 refill();
834+ adjustMinYExtent();
834 polish();
835 polish();
835 m_contentHeightDirty = true;
836 m_contentHeightDirty = true;
836 }
837 }
tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp+2−2
@@ -1086,7 +1086,7 @@ private Q_SLOTS:
1086 verifyItem(2, 192, 350., false);
1086 verifyItem(2, 192, 350., false);
1087 verifyItem(3, 542, 125., true);
1087 verifyItem(3, 542, 125., true);
1088 verifyItem(4, 667, 100., true);
1088 verifyItem(4, 667, 100., true);
1089− QCOMPARE(lvwph->m_minYExtent, 350.);
1089+ QCOMPARE(lvwph->m_minYExtent, 65.);
1090 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
1090 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
1091 QCOMPARE(lvwph->m_clipItem->clip(), false);
1091 QCOMPARE(lvwph->m_clipItem->clip(), false);
1092 QCOMPARE(lvwph->m_headerItem->y(), 0.);
1092 QCOMPARE(lvwph->m_headerItem->y(), 0.);
@@ -1345,7 +1345,7 @@ private Q_SLOTS:
1345 verifyItem(1, -158, 350., false);
1345 verifyItem(1, -158, 350., false);
1346 verifyItem(2, 192, 350., false);
1346 verifyItem(2, 192, 350., false);
1347 verifyItem(3, 542, 150., true);
1347 verifyItem(3, 542, 150., true);
1348− QCOMPARE(lvwph->m_minYExtent, 0.);
1348+ QCOMPARE(lvwph->m_minYExtent, -100.);
1349 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
1349 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
1350 QCOMPARE(lvwph->m_clipItem->clip(), false);
1350 QCOMPARE(lvwph->m_clipItem->clip(), false);
1351 QCOMPARE(lvwph->m_headerItem->y(), 0.);
1351 QCOMPARE(lvwph->m_headerItem->y(), 0.);
tests/plugins/ListViewWithPageHeader/listviewwithpageheadertestsection.cpp+4−4
@@ -1025,7 +1025,7 @@ private Q_SLOTS:
1025 verifyItem(1, 70, 390., false, "Bold", false);
1025 verifyItem(1, 70, 390., false, "Bold", false);
1026 verifyItem(2, 460, 350., false, QString(), false);
1026 verifyItem(2, 460, 350., false, QString(), false);
1027 verifyItem(3, 810, 390., true, "Lazy", true);
1027 verifyItem(3, 810, 390., true, "Lazy", true);
1028− QCOMPARE(lvwph->m_minYExtent, 970./3.);
1028+ QCOMPARE(lvwph->m_minYExtent, 330.);
1029 QCOMPARE(lvwph->m_clipItem->y(), 800.);
1029 QCOMPARE(lvwph->m_clipItem->y(), 800.);
1030 QCOMPARE(lvwph->m_clipItem->clip(), false);
1030 QCOMPARE(lvwph->m_clipItem->clip(), false);
1031 QCOMPARE(lvwph->m_headerItem->y(), 0.);
1031 QCOMPARE(lvwph->m_headerItem->y(), 0.);
@@ -1235,7 +1235,7 @@ private Q_SLOTS:
1235 verifyItem(2, 152, 390., false, "Lazy", false);
1235 verifyItem(2, 152, 390., false, "Lazy", false);
1236 verifyItem(3, 542, 165., true, "Regular", true);
1236 verifyItem(3, 542, 165., true, "Regular", true);
1237 verifyItem(4, 707, 140., true, "Agressive", true);
1237 verifyItem(4, 707, 140., true, "Agressive", true);
1238− QCOMPARE(lvwph->m_minYExtent, 310.);
1238+ QCOMPARE(lvwph->m_minYExtent, 41.);
1239 QCOMPARE(lvwph->m_clipItem->y(), 1458.);
1239 QCOMPARE(lvwph->m_clipItem->y(), 1458.);
1240 QCOMPARE(lvwph->m_clipItem->clip(), false);
1240 QCOMPARE(lvwph->m_clipItem->clip(), false);
1241 QCOMPARE(lvwph->m_headerItem->y(), 0.);
1241 QCOMPARE(lvwph->m_headerItem->y(), 0.);
@@ -1480,7 +1480,7 @@ private Q_SLOTS:
1480 verifyItem(1, -40, 390., false, "Mild", true);
1480 verifyItem(1, -40, 390., false, "Mild", true);
1481 verifyItem(2, 350, 390., false, "Bold", false);
1481 verifyItem(2, 350, 390., false, "Bold", false);
1482 verifyItem(3, 740, 390., true, "Lazy", true);
1482 verifyItem(3, 740, 390., true, "Lazy", true);
1483− QCOMPARE(lvwph->m_minYExtent, 152.5);
1483+ QCOMPARE(lvwph->m_minYExtent, 162.5);
1484 QCOMPARE(lvwph->m_clipItem->y(), 520.);
1484 QCOMPARE(lvwph->m_clipItem->y(), 520.);
1485 QCOMPARE(lvwph->m_clipItem->clip(), false);
1485 QCOMPARE(lvwph->m_clipItem->clip(), false);
1486 QCOMPARE(lvwph->m_headerItem->y(), 0.);
1486 QCOMPARE(lvwph->m_headerItem->y(), 0.);
@@ -1558,7 +1558,7 @@ private Q_SLOTS:
1558 verifyItem(1, -198, 350., false, QString(), true);
1558 verifyItem(1, -198, 350., false, QString(), true);
1559 verifyItem(2, 152, 390., false, "Lazy", false);
1559 verifyItem(2, 152, 390., false, "Lazy", false);
1560 verifyItem(3, 542, 190., true, "Agressive", true);
1560 verifyItem(3, 542, 190., true, "Agressive", true);
1561− QCOMPARE(lvwph->m_minYExtent, -200./3.);
1561+ QCOMPARE(lvwph->m_minYExtent, -160.);
1562 QCOMPARE(lvwph->m_clipItem->y(), 1458.);
1562 QCOMPARE(lvwph->m_clipItem->y(), 1458.);
1563 QCOMPARE(lvwph->m_clipItem->clip(), false);
1563 QCOMPARE(lvwph->m_clipItem->clip(), false);
1564 QCOMPARE(lvwph->m_headerItem->y(), 0.);
1564 QCOMPARE(lvwph->m_headerItem->y(), 0.);