git.iko.soy/unity8
on xenial help sign in
Update m_minYExtent more often and make it have more "accurate" values
24ffcc6Albert Astals
plugins/ListViewWithPageHeader/listviewwithpageheader.cpp+31−4
compare with xenial
unifiedsplit
@@ -70,6 +70,12 @@
70 * that is used for the cases we need to show the sticky section item at
70 * that is used for the cases we need to show the sticky section item at
71 * the top of the view.
71 * the top of the view.
72 *
72 *
73+ * Note that minYExtent and height are not always totally accurate, since
74+ * we don't have the items created we can't guess their heights
75+ * so we can only guarantee the values are correct when the first/last
76+ * items of the list are visible, otherwise we just live with good enough
77+ * values that make the list scrollable
78+ *
73 * There are a few things that are not really implemented or tested properly
79 * There are a few things that are not really implemented or tested properly
74 * which we don't use at the moment like changing the model, changing
80 * which we don't use at the moment like changing the model, changing
75 * the section delegate, having a section delegate that changes its size, etc.
81 * the section delegate, having a section delegate that changes its size, etc.
@@ -191,6 +197,7 @@ void ListViewWithPageHeader::setDelegate(QQmlComponent *delegate)
191 releaseItem(item);
197 releaseItem(item);
192 m_visibleItems.clear();
198 m_visibleItems.clear();
193 m_firstVisibleIndex = -1;
199 m_firstVisibleIndex = -1;
200+ adjustMinYExtent();
194 setContentY(0);
201 setContentY(0);
195 m_clipItem->setY(0);
202 m_clipItem->setY(0);
196
203
@@ -568,6 +575,7 @@ bool ListViewWithPageHeader::removeNonVisibleItems(qreal bufferFrom, qreal buffe
568 bool foundVisible = false;
575 bool foundVisible = false;
569 int i = 0;
576 int i = 0;
570 int removedItems = 0;
577 int removedItems = 0;
578+ const auto oldFirstVisibleIndex = m_firstVisibleIndex;
571 while (i < m_visibleItems.count()) {
579 while (i < m_visibleItems.count()) {
572 ListItem *item = m_visibleItems[i];
580 ListItem *item = m_visibleItems[i];
573 const qreal pos = item->y() + m_clipItem->y();
581 const qreal pos = item->y() + m_clipItem->y();
@@ -587,6 +595,9 @@ bool ListViewWithPageHeader::removeNonVisibleItems(qreal bufferFrom, qreal buffe
587 ++i;
595 ++i;
588 }
596 }
589 }
597 }
598+ if (m_firstVisibleIndex != oldFirstVisibleIndex) {
599+ adjustMinYExtent();
600+ }
590
601
591 return changed;
602 return changed;
592}
603}
@@ -682,6 +693,8 @@ void ListViewWithPageHeader::onModelUpdated(const QQuickChangeSet &changeSet, bo
682{
693{
683 // TODO Do something with reset
694 // TODO Do something with reset
684// qDebug() << "ListViewWithPageHeader::onModelUpdated" << changeSet << reset;
695// qDebug() << "ListViewWithPageHeader::onModelUpdated" << changeSet << reset;
696+ const auto oldFirstVisibleIndex = m_firstVisibleIndex;
697+
685 foreach(const QQuickChangeSet::Remove &remove, changeSet.removes()) {
698 foreach(const QQuickChangeSet::Remove &remove, changeSet.removes()) {
686// qDebug() << "ListViewWithPageHeader::onModelUpdated Remove" << remove;
699// qDebug() << "ListViewWithPageHeader::onModelUpdated Remove" << remove;
687 if (remove.index + remove.count > m_firstVisibleIndex && remove.index < m_firstVisibleIndex + m_visibleItems.count()) {
700 if (remove.index + remove.count > m_firstVisibleIndex && remove.index < m_firstVisibleIndex + m_visibleItems.count()) {
@@ -791,6 +804,10 @@ void ListViewWithPageHeader::onModelUpdated(const QQuickChangeSet &changeSet, bo
791 }
804 }
792 }
805 }
793
806
807+ if (m_firstVisibleIndex != oldFirstVisibleIndex) {
808+ adjustMinYExtent();
809+ }
810+
794 layout();
811 layout();
795 polish();
812 polish();
796 m_contentHeightDirty = true;
813 m_contentHeightDirty = true;
@@ -845,8 +862,18 @@ void ListViewWithPageHeader::adjustMinYExtent()
845 if (m_visibleItems.isEmpty()) {
862 if (m_visibleItems.isEmpty()) {
846 m_minYExtent = 0;
863 m_minYExtent = 0;
847 } else {
864 } else {
865+ qreal nonCreatedHeight = 0;
866+ if (m_firstVisibleIndex != 0) {
867+ // Calculate the average height of items to estimate the position of the list start
868+ const int visibleItems = m_visibleItems.count();
869+ qreal visibleItemsHeight = 0;
870+ foreach(ListItem *item, m_visibleItems) {
871+ visibleItemsHeight += item->height();
872+ }
873+ nonCreatedHeight = m_firstVisibleIndex * visibleItemsHeight / visibleItems;
874+// qDebug() << m_firstVisibleIndex << visibleItemsHeight << visibleItems << nonCreatedHeight;
875+ }
848− m_minYExtent = -m_visibleItems.first()->y() - m_clipItem->y() + (m_headerItem ? m_headerItem->height() : 0);
876+ m_minYExtent = nonCreatedHeight - m_visibleItems.first()->y() - m_clipItem->y() + (m_headerItem ? m_headerItem->height() : 0);
849− qDebug() << "adjustMinYExtent" << m_minYExtent << m_visibleItems.first()->y() << m_clipItem->y();
850 }
877 }
851}
878}
852
879
@@ -867,7 +894,7 @@ void ListViewWithPageHeader::layout()
867
894
868 qreal pos = m_visibleItems.first()->y();
895 qreal pos = m_visibleItems.first()->y();
869
896
870−// qDebug() << "ListViewWithPageHeader::updatePolish Updating positions and heights. contentY" << contentY() << "minYExtent" << minYExtent();
897+// qDebug() << "ListViewWithPageHeader::layout Updating positions and heights. contentY" << contentY() << "minYExtent" << minYExtent();
871 int firstReallyVisibleItem = -1;
898 int firstReallyVisibleItem = -1;
872 int modelIndex = m_firstVisibleIndex;
899 int modelIndex = m_firstVisibleIndex;
873 foreach(ListItem *item, m_visibleItems) {
900 foreach(ListItem *item, m_visibleItems) {
@@ -906,7 +933,7 @@ void ListViewWithPageHeader::layout()
906 } else {
933 } else {
907 context->setContextProperty(QLatin1String("heightToClip"), QVariant::fromValue<int>(0));
934 context->setContextProperty(QLatin1String("heightToClip"), QVariant::fromValue<int>(0));
908 }
935 }
909−// qDebug() << "ListViewWithPageHeader::updatePolish" << item->m_item;
936+// qDebug() << "ListViewWithPageHeader::layout" << item->m_item;
910 pos += item->height();
937 pos += item->height();
911 ++modelIndex;
938 ++modelIndex;
912 }
939 }
tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp+38−32
@@ -216,7 +216,13 @@ private Q_SLOTS:
216 verifyItem(1, -120, 350., false);
216 verifyItem(1, -120, 350., false);
217 verifyItem(2, 230, 350., false);
217 verifyItem(2, 230, 350., false);
218 verifyItem(3, 580, 350., true);
218 verifyItem(3, 580, 350., true);
219+ // Just here as first check against m_minYExtent when m_firstVisibleIndex is not 0
220+ // We as humans know that m_minYExtent will be 0 but since the first delegate is not there anymore
221+ // we have to estimate its size, the average item height is 312.5 which is 162.5 more than the
222+ // "real" size of 150 and that's why the m_minYExtent has that "peculiar" value
223+ // It's fine since what it means is that we could scroll more up than the original position
224+ // but we will recalculate m_minYExtent when the item 0 is created and set it correctly
219− QCOMPARE(lvwph->m_minYExtent, 0.);
225+ QCOMPARE(lvwph->m_minYExtent, 162.5);
220 QCOMPARE(lvwph->m_clipItem->y(), 520.);
226 QCOMPARE(lvwph->m_clipItem->y(), 520.);
221 QCOMPARE(lvwph->m_clipItem->clip(), false);
227 QCOMPARE(lvwph->m_clipItem->clip(), false);
222 QCOMPARE(lvwph->m_headerItem->y(), 0.);
228 QCOMPARE(lvwph->m_headerItem->y(), 0.);
@@ -336,7 +342,7 @@ private Q_SLOTS:
336 verifyItem(1, -120, 350., false);
342 verifyItem(1, -120, 350., false);
337 verifyItem(2, 230, 350., false);
343 verifyItem(2, 230, 350., false);
338 verifyItem(3, 580, 350., true);
344 verifyItem(3, 580, 350., true);
339− QCOMPARE(lvwph->m_minYExtent, 0.);
345+ QCOMPARE(lvwph->m_minYExtent, 162.5);
340 QCOMPARE(lvwph->m_clipItem->y(), 520.);
346 QCOMPARE(lvwph->m_clipItem->y(), 520.);
341 QCOMPARE(lvwph->m_clipItem->clip(), false);
347 QCOMPARE(lvwph->m_clipItem->clip(), false);
342 QCOMPARE(lvwph->m_headerItem->y(), 0.);
348 QCOMPARE(lvwph->m_headerItem->y(), 0.);
@@ -468,7 +474,7 @@ private Q_SLOTS:
468 verifyItem(1, -120, 350., false);
474 verifyItem(1, -120, 350., false);
469 verifyItem(2, 230, 350., false);
475 verifyItem(2, 230, 350., false);
470 verifyItem(3, 580, 350., true);
476 verifyItem(3, 580, 350., true);
471− QCOMPARE(lvwph->m_minYExtent, 0.);
477+ QCOMPARE(lvwph->m_minYExtent, 162.5);
472 QCOMPARE(lvwph->m_clipItem->y(), 520.);
478 QCOMPARE(lvwph->m_clipItem->y(), 520.);
473 QCOMPARE(lvwph->m_clipItem->clip(), false);
479 QCOMPARE(lvwph->m_clipItem->clip(), false);
474 QCOMPARE(lvwph->m_headerItem->y(), 0.);
480 QCOMPARE(lvwph->m_headerItem->y(), 0.);
@@ -484,7 +490,7 @@ private Q_SLOTS:
484 verifyItem(1, -120, 350., false);
490 verifyItem(1, -120, 350., false);
485 verifyItem(2, 230, 350., false);
491 verifyItem(2, 230, 350., false);
486 verifyItem(3, 580, 350., true);
492 verifyItem(3, 580, 350., true);
487− QCOMPARE(lvwph->m_minYExtent, 0.);
493+ QCOMPARE(lvwph->m_minYExtent, 162.5);
488 QCOMPARE(lvwph->m_clipItem->y(), 520.);
494 QCOMPARE(lvwph->m_clipItem->y(), 520.);
489 QCOMPARE(lvwph->m_clipItem->clip(), false);
495 QCOMPARE(lvwph->m_clipItem->clip(), false);
490 QCOMPARE(lvwph->m_headerItem->y(), 0.);
496 QCOMPARE(lvwph->m_headerItem->y(), 0.);
@@ -516,7 +522,7 @@ private Q_SLOTS:
516 verifyItem(0, -508., 350., true);
522 verifyItem(0, -508., 350., true);
517 verifyItem(1, -158, 350., false);
523 verifyItem(1, -158, 350., false);
518 verifyItem(2, 192, 350., false);
524 verifyItem(2, 192, 350., false);
519− QCOMPARE(lvwph->m_minYExtent, 0.);
525+ QCOMPARE(lvwph->m_minYExtent, 350.);
520 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
526 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
521 QCOMPARE(lvwph->m_clipItem->clip(), false);
527 QCOMPARE(lvwph->m_clipItem->clip(), false);
522 QCOMPARE(lvwph->m_headerItem->y(), 0.);
528 QCOMPARE(lvwph->m_headerItem->y(), 0.);
@@ -530,7 +536,7 @@ private Q_SLOTS:
530 verifyItem(0, -508., 350., true);
536 verifyItem(0, -508., 350., true);
531 verifyItem(1, -158, 350., false);
537 verifyItem(1, -158, 350., false);
532 verifyItem(2, 192, 350., false);
538 verifyItem(2, 192, 350., false);
533− QCOMPARE(lvwph->m_minYExtent, 0.);
539+ QCOMPARE(lvwph->m_minYExtent, 350.);
534 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
540 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
535 QCOMPARE(lvwph->m_clipItem->clip(), true);
541 QCOMPARE(lvwph->m_clipItem->clip(), true);
536 QCOMPARE(lvwph->m_headerItem->y(), 1208.);
542 QCOMPARE(lvwph->m_headerItem->y(), 1208.);
@@ -544,10 +550,10 @@ private Q_SLOTS:
544 verifyItem(0, -508., 350., true);
550 verifyItem(0, -508., 350., true);
545 verifyItem(1, -158, 350., false);
551 verifyItem(1, -158, 350., false);
546 verifyItem(2, 192, 350., false);
552 verifyItem(2, 192, 350., false);
547− QCOMPARE(lvwph->m_minYExtent, 0.);
553+ QCOMPARE(lvwph->m_minYExtent, 350.);
548 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
554 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
549 QCOMPARE(lvwph->m_clipItem->clip(), false);
555 QCOMPARE(lvwph->m_clipItem->clip(), false);
550− QCOMPARE(lvwph->m_headerItem->y(), 0.);
556+ QCOMPARE(lvwph->m_headerItem->y(), -350.);
551 QCOMPARE(lvwph->m_headerItem->height(), 50.);
557 QCOMPARE(lvwph->m_headerItem->height(), 50.);
552 QCOMPARE(lvwph->contentY(), 1258.);
558 QCOMPARE(lvwph->contentY(), 1258.);
553 QCOMPARE(lvwph->m_headerItemShownHeight, 0.);
559 QCOMPARE(lvwph->m_headerItemShownHeight, 0.);
@@ -558,7 +564,7 @@ private Q_SLOTS:
558 verifyItem(0, -508., 350., true);
564 verifyItem(0, -508., 350., true);
559 verifyItem(1, -158, 350., false);
565 verifyItem(1, -158, 350., false);
560 verifyItem(2, 192, 350., false);
566 verifyItem(2, 192, 350., false);
561− QCOMPARE(lvwph->m_minYExtent, 0.);
567+ QCOMPARE(lvwph->m_minYExtent, 350.);
562 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
568 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
563 QCOMPARE(lvwph->m_clipItem->clip(), true);
569 QCOMPARE(lvwph->m_clipItem->clip(), true);
564 QCOMPARE(lvwph->m_headerItem->y(), 1208.);
570 QCOMPARE(lvwph->m_headerItem->y(), 1208.);
@@ -575,7 +581,7 @@ private Q_SLOTS:
575 verifyItem(0, -508., 350., true);
581 verifyItem(0, -508., 350., true);
576 verifyItem(1, -158, 350., false);
582 verifyItem(1, -158, 350., false);
577 verifyItem(2, 192, 350., false);
583 verifyItem(2, 192, 350., false);
578− QCOMPARE(lvwph->m_minYExtent, 0.);
584+ QCOMPARE(lvwph->m_minYExtent, 350.);
579 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
585 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
580 QCOMPARE(lvwph->m_clipItem->clip(), false);
586 QCOMPARE(lvwph->m_clipItem->clip(), false);
581 QCOMPARE(lvwph->m_headerItem->y(), 0.);
587 QCOMPARE(lvwph->m_headerItem->y(), 0.);
@@ -643,7 +649,7 @@ private Q_SLOTS:
643 verifyItem(0, -508., 350., true);
649 verifyItem(0, -508., 350., true);
644 verifyItem(1, -158, 350., false);
650 verifyItem(1, -158, 350., false);
645 verifyItem(2, 192, 350., false);
651 verifyItem(2, 192, 350., false);
646− QCOMPARE(lvwph->m_minYExtent, 0.);
652+ QCOMPARE(lvwph->m_minYExtent, 350.);
647 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
653 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
648 QCOMPARE(lvwph->m_clipItem->clip(), false);
654 QCOMPARE(lvwph->m_clipItem->clip(), false);
649 QCOMPARE(lvwph->m_headerItem->y(), 0.);
655 QCOMPARE(lvwph->m_headerItem->y(), 0.);
@@ -658,7 +664,7 @@ private Q_SLOTS:
658 verifyItem(0, -508., 350., true);
664 verifyItem(0, -508., 350., true);
659 verifyItem(1, -158, 350., false);
665 verifyItem(1, -158, 350., false);
660 verifyItem(2, 192, 350., false);
666 verifyItem(2, 192, 350., false);
661− QCOMPARE(lvwph->m_minYExtent, -650.);
667+ QCOMPARE(lvwph->m_minYExtent, 400.);
662 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
668 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
663 QCOMPARE(lvwph->m_clipItem->clip(), false);
669 QCOMPARE(lvwph->m_clipItem->clip(), false);
664 QCOMPARE(lvwph->m_headerItem->y(), 0.);
670 QCOMPARE(lvwph->m_headerItem->y(), 0.);
@@ -673,7 +679,7 @@ private Q_SLOTS:
673 verifyItem(0, -508., 350., true);
679 verifyItem(0, -508., 350., true);
674 verifyItem(1, -158, 350., false);
680 verifyItem(1, -158, 350., false);
675 verifyItem(2, 192, 350., false);
681 verifyItem(2, 192, 350., false);
676− QCOMPARE(lvwph->m_minYExtent, -650.);
682+ QCOMPARE(lvwph->m_minYExtent, 400.);
677 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
683 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
678 QCOMPARE(lvwph->m_clipItem->clip(), true);
684 QCOMPARE(lvwph->m_clipItem->clip(), true);
679 QCOMPARE(lvwph->m_headerItem->y(), 1158.);
685 QCOMPARE(lvwph->m_headerItem->y(), 1158.);
@@ -707,7 +713,7 @@ private Q_SLOTS:
707 verifyItem(0, -508., 350., true);
713 verifyItem(0, -508., 350., true);
708 verifyItem(1, -158, 350., false);
714 verifyItem(1, -158, 350., false);
709 verifyItem(2, 192, 350., false);
715 verifyItem(2, 192, 350., false);
710− QCOMPARE(lvwph->m_minYExtent, 0.);
716+ QCOMPARE(lvwph->m_minYExtent, 350.);
711 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
717 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
712 QCOMPARE(lvwph->m_clipItem->clip(), false);
718 QCOMPARE(lvwph->m_clipItem->clip(), false);
713 QCOMPARE(lvwph->m_headerItem->y(), 0.);
719 QCOMPARE(lvwph->m_headerItem->y(), 0.);
@@ -722,7 +728,7 @@ private Q_SLOTS:
722 verifyItem(0, -508., 350., true);
728 verifyItem(0, -508., 350., true);
723 verifyItem(1, -158, 350., false);
729 verifyItem(1, -158, 350., false);
724 verifyItem(2, 192, 350., false);
730 verifyItem(2, 192, 350., false);
725− QCOMPARE(lvwph->m_minYExtent, 0.);
731+ QCOMPARE(lvwph->m_minYExtent, 350.);
726 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
732 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
727 QCOMPARE(lvwph->m_clipItem->clip(), true);
733 QCOMPARE(lvwph->m_clipItem->clip(), true);
728 QCOMPARE(lvwph->m_headerItem->y(), 1208.);
734 QCOMPARE(lvwph->m_headerItem->y(), 1208.);
@@ -737,7 +743,7 @@ private Q_SLOTS:
737 verifyItem(0, -508., 350., true);
743 verifyItem(0, -508., 350., true);
738 verifyItem(1, -158, 350., false);
744 verifyItem(1, -158, 350., false);
739 verifyItem(2, 192, 350., false);
745 verifyItem(2, 192, 350., false);
740− QCOMPARE(lvwph->m_minYExtent, -700.);
746+ QCOMPARE(lvwph->m_minYExtent, 350.);
741 QCOMPARE(lvwph->m_clipItem->y(), 1308.);
747 QCOMPARE(lvwph->m_clipItem->y(), 1308.);
742 QCOMPARE(lvwph->m_clipItem->clip(), true);
748 QCOMPARE(lvwph->m_clipItem->clip(), true);
743 QCOMPARE(lvwph->m_headerItem->y(), 1208.);
749 QCOMPARE(lvwph->m_headerItem->y(), 1208.);
@@ -773,7 +779,7 @@ private Q_SLOTS:
773 verifyItem(0, -508., 350., true);
779 verifyItem(0, -508., 350., true);
774 verifyItem(1, -158, 350., false);
780 verifyItem(1, -158, 350., false);
775 verifyItem(2, 192, 350., false);
781 verifyItem(2, 192, 350., false);
776− QCOMPARE(lvwph->m_minYExtent, -650.);
782+ QCOMPARE(lvwph->m_minYExtent, 400.);
777 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
783 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
778 QCOMPARE(lvwph->m_clipItem->clip(), true);
784 QCOMPARE(lvwph->m_clipItem->clip(), true);
779 QCOMPARE(lvwph->m_headerItem->y(), 1158.);
785 QCOMPARE(lvwph->m_headerItem->y(), 1158.);
@@ -788,7 +794,7 @@ private Q_SLOTS:
788 verifyItem(0, -508., 350., true);
794 verifyItem(0, -508., 350., true);
789 verifyItem(1, -158, 350., false);
795 verifyItem(1, -158, 350., false);
790 verifyItem(2, 192, 350., false);
796 verifyItem(2, 192, 350., false);
791− QCOMPARE(lvwph->m_minYExtent, -670.);
797+ QCOMPARE(lvwph->m_minYExtent, 380.);
792 QCOMPARE(lvwph->m_clipItem->y(), 1228.);
798 QCOMPARE(lvwph->m_clipItem->y(), 1228.);
793 QCOMPARE(lvwph->m_clipItem->clip(), false);
799 QCOMPARE(lvwph->m_clipItem->clip(), false);
794 QCOMPARE(lvwph->m_headerItem->y(), 1158.);
800 QCOMPARE(lvwph->m_headerItem->y(), 1158.);
@@ -842,7 +848,7 @@ private Q_SLOTS:
842 verifyItem(0, -508., 350., true);
848 verifyItem(0, -508., 350., true);
843 verifyItem(1, -158, 350., false);
849 verifyItem(1, -158, 350., false);
844 verifyItem(2, 192, 350., false);
850 verifyItem(2, 192, 350., false);
845− QCOMPARE(lvwph->m_minYExtent, -750.);
851+ QCOMPARE(lvwph->m_minYExtent, 300.);
846 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
852 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
847 QCOMPARE(lvwph->m_clipItem->clip(), false);
853 QCOMPARE(lvwph->m_clipItem->clip(), false);
848 QCOMPARE(lvwph->m_headerItem, (QQuickItem*)nullptr);
854 QCOMPARE(lvwph->m_headerItem, (QQuickItem*)nullptr);
@@ -876,7 +882,7 @@ private Q_SLOTS:
876 verifyItem(0, -508., 350., true);
882 verifyItem(0, -508., 350., true);
877 verifyItem(1, -158, 350., false);
883 verifyItem(1, -158, 350., false);
878 verifyItem(2, 192, 350., false);
884 verifyItem(2, 192, 350., false);
879− QCOMPARE(lvwph->m_minYExtent, -720.);
885+ QCOMPARE(lvwph->m_minYExtent, 330.);
880 QCOMPARE(lvwph->m_clipItem->y(), 1228.);
886 QCOMPARE(lvwph->m_clipItem->y(), 1228.);
881 QCOMPARE(lvwph->m_clipItem->clip(), false);
887 QCOMPARE(lvwph->m_clipItem->clip(), false);
882 QCOMPARE(lvwph->m_headerItem, (QQuickItem*)nullptr);
888 QCOMPARE(lvwph->m_headerItem, (QQuickItem*)nullptr);
@@ -968,7 +974,7 @@ private Q_SLOTS:
968 verifyItem(1, 50, 350., false);
974 verifyItem(1, 50, 350., false);
969 verifyItem(2, 400, 350., false);
975 verifyItem(2, 400, 350., false);
970 verifyItem(3, 750, 350., true);
976 verifyItem(3, 750, 350., true);
971− QCOMPARE(lvwph->m_minYExtent, 0.);
977+ QCOMPARE(lvwph->m_minYExtent, 350.);
972 QCOMPARE(lvwph->m_clipItem->y(), 700.);
978 QCOMPARE(lvwph->m_clipItem->y(), 700.);
973 QCOMPARE(lvwph->m_clipItem->clip(), false);
979 QCOMPARE(lvwph->m_clipItem->clip(), false);
974 QCOMPARE(lvwph->m_headerItem->y(), 0.);
980 QCOMPARE(lvwph->m_headerItem->y(), 0.);
@@ -985,7 +991,7 @@ private Q_SLOTS:
985 verifyItem(1, 50, 350., false);
991 verifyItem(1, 50, 350., false);
986 verifyItem(2, 400, 350., false);
992 verifyItem(2, 400, 350., false);
987 verifyItem(3, 750, 350., true);
993 verifyItem(3, 750, 350., true);
988− QCOMPARE(lvwph->m_minYExtent, 0.);
994+ QCOMPARE(lvwph->m_minYExtent, 1050.);
989 QCOMPARE(lvwph->m_clipItem->y(), 700.);
995 QCOMPARE(lvwph->m_clipItem->y(), 700.);
990 QCOMPARE(lvwph->m_clipItem->clip(), false);
996 QCOMPARE(lvwph->m_clipItem->clip(), false);
991 QCOMPARE(lvwph->m_headerItem->y(), 0.);
997 QCOMPARE(lvwph->m_headerItem->y(), 0.);
@@ -1041,7 +1047,7 @@ private Q_SLOTS:
1041 verifyItem(1, -120, 350., false);
1047 verifyItem(1, -120, 350., false);
1042 verifyItem(2, 230, 350., false);
1048 verifyItem(2, 230, 350., false);
1043 verifyItem(3, 580, 350., true);
1049 verifyItem(3, 580, 350., true);
1044− QCOMPARE(lvwph->m_minYExtent, 0.);
1050+ QCOMPARE(lvwph->m_minYExtent, 162.5);
1045 QCOMPARE(lvwph->m_clipItem->y(), 520.);
1051 QCOMPARE(lvwph->m_clipItem->y(), 520.);
1046 QCOMPARE(lvwph->m_clipItem->clip(), false);
1052 QCOMPARE(lvwph->m_clipItem->clip(), false);
1047 QCOMPARE(lvwph->m_headerItem->y(), 0.);
1053 QCOMPARE(lvwph->m_headerItem->y(), 0.);
@@ -1058,7 +1064,7 @@ private Q_SLOTS:
1058 verifyItem(1, -120, 350., false);
1064 verifyItem(1, -120, 350., false);
1059 verifyItem(2, 230, 350., false);
1065 verifyItem(2, 230, 350., false);
1060 verifyItem(3, 580, 350., true);
1066 verifyItem(3, 580, 350., true);
1061− QCOMPARE(lvwph->m_minYExtent, 0.);
1067+ QCOMPARE(lvwph->m_minYExtent, 787.5);
1062 QCOMPARE(lvwph->m_clipItem->y(), 520.);
1068 QCOMPARE(lvwph->m_clipItem->y(), 520.);
1063 QCOMPARE(lvwph->m_clipItem->clip(), false);
1069 QCOMPARE(lvwph->m_clipItem->clip(), false);
1064 QCOMPARE(lvwph->m_headerItem->y(), 0.);
1070 QCOMPARE(lvwph->m_headerItem->y(), 0.);
@@ -1096,7 +1102,7 @@ private Q_SLOTS:
1096 verifyItem(2, 25, 350., false);
1102 verifyItem(2, 25, 350., false);
1097 verifyItem(3, 375, 350., false);
1103 verifyItem(3, 375, 350., false);
1098 verifyItem(4, 725, 350., true);
1104 verifyItem(4, 725, 350., true);
1099− QCOMPARE(lvwph->m_minYExtent, -50.);
1105+ QCOMPARE(lvwph->m_minYExtent, 490.);
1100 QCOMPARE(lvwph->m_clipItem->y(), 375.);
1106 QCOMPARE(lvwph->m_clipItem->y(), 375.);
1101 QCOMPARE(lvwph->m_clipItem->clip(), false);
1107 QCOMPARE(lvwph->m_clipItem->clip(), false);
1102 QCOMPARE(lvwph->m_headerItem->y(), 0.);
1108 QCOMPARE(lvwph->m_headerItem->y(), 0.);
@@ -1138,7 +1144,7 @@ private Q_SLOTS:
1138 verifyItem(2, 192, 350., false);
1144 verifyItem(2, 192, 350., false);
1139 verifyItem(3, 542, 125., true);
1145 verifyItem(3, 542, 125., true);
1140 verifyItem(4, 667, 100., true);
1146 verifyItem(4, 667, 100., true);
1141− QCOMPARE(lvwph->m_minYExtent, 0.);
1147+ QCOMPARE(lvwph->m_minYExtent, 350.);
1142 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
1148 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
1143 QCOMPARE(lvwph->m_clipItem->clip(), false);
1149 QCOMPARE(lvwph->m_clipItem->clip(), false);
1144 QCOMPARE(lvwph->m_headerItem->y(), 0.);
1150 QCOMPARE(lvwph->m_headerItem->y(), 0.);
@@ -1155,7 +1161,7 @@ private Q_SLOTS:
1155 verifyItem(1, -33, 350., false);
1161 verifyItem(1, -33, 350., false);
1156 verifyItem(2, 317, 125., false);
1162 verifyItem(2, 317, 125., false);
1157 verifyItem(3, 442, 100., false);
1163 verifyItem(3, 442, 100., false);
1158− QCOMPARE(lvwph->m_minYExtent, 0.);
1164+ QCOMPARE(lvwph->m_minYExtent, -125.);
1159 QCOMPARE(lvwph->m_clipItem->y(), 1483.);
1165 QCOMPARE(lvwph->m_clipItem->y(), 1483.);
1160 QCOMPARE(lvwph->m_clipItem->clip(), false);
1166 QCOMPARE(lvwph->m_clipItem->clip(), false);
1161 QCOMPARE(lvwph->m_headerItem->y(), 0.);
1167 QCOMPARE(lvwph->m_headerItem->y(), 0.);
@@ -1205,7 +1211,7 @@ private Q_SLOTS:
1205 verifyItem(0, -508., 350., true);
1211 verifyItem(0, -508., 350., true);
1206 verifyItem(1, -158, 350., false);
1212 verifyItem(1, -158, 350., false);
1207 verifyItem(2, 192, 350., false);
1213 verifyItem(2, 192, 350., false);
1208− QCOMPARE(lvwph->m_minYExtent, 0.);
1214+ QCOMPARE(lvwph->m_minYExtent, 3850.);
1209 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
1215 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
1210 QCOMPARE(lvwph->m_clipItem->clip(), false);
1216 QCOMPARE(lvwph->m_clipItem->clip(), false);
1211 QCOMPARE(lvwph->m_headerItem->y(), 0.);
1217 QCOMPARE(lvwph->m_headerItem->y(), 0.);
@@ -1268,7 +1274,7 @@ private Q_SLOTS:
1268 verifyItem(0, -508., 350., true);
1274 verifyItem(0, -508., 350., true);
1269 verifyItem(1, -158, 350., false);
1275 verifyItem(1, -158, 350., false);
1270 verifyItem(2, 192, 350., false);
1276 verifyItem(2, 192, 350., false);
1271− QCOMPARE(lvwph->m_minYExtent, 0.);
1277+ QCOMPARE(lvwph->m_minYExtent, -350.);
1272 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
1278 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
1273 QCOMPARE(lvwph->m_clipItem->clip(), false);
1279 QCOMPARE(lvwph->m_clipItem->clip(), false);
1274 QCOMPARE(lvwph->m_headerItem->y(), 0.);
1280 QCOMPARE(lvwph->m_headerItem->y(), 0.);
@@ -1288,7 +1294,7 @@ private Q_SLOTS:
1288 verifyItem(0, -358., 200., true);
1294 verifyItem(0, -358., 200., true);
1289 verifyItem(1, -158, 350., false);
1295 verifyItem(1, -158, 350., false);
1290 verifyItem(2, 192, 350., false);
1296 verifyItem(2, 192, 350., false);
1291− QCOMPARE(lvwph->m_minYExtent, -150.);
1297+ QCOMPARE(lvwph->m_minYExtent, 150.);
1292 QCOMPARE(lvwph->m_clipItem->y(), 558.);
1298 QCOMPARE(lvwph->m_clipItem->y(), 558.);
1293 QCOMPARE(lvwph->m_clipItem->clip(), false);
1299 QCOMPARE(lvwph->m_clipItem->clip(), false);
1294 QCOMPARE(lvwph->m_headerItem->y(), 0.);
1300 QCOMPARE(lvwph->m_headerItem->y(), 0.);
@@ -1307,7 +1313,7 @@ private Q_SLOTS:
1307 verifyItem(1, -120, 350., false);
1313 verifyItem(1, -120, 350., false);
1308 verifyItem(2, 230, 350., false);
1314 verifyItem(2, 230, 350., false);
1309 verifyItem(3, 580, 350., true);
1315 verifyItem(3, 580, 350., true);
1310− QCOMPARE(lvwph->m_minYExtent, 0.);
1316+ QCOMPARE(lvwph->m_minYExtent, 162.5);
1311 QCOMPARE(lvwph->m_clipItem->y(), 520.);
1317 QCOMPARE(lvwph->m_clipItem->y(), 520.);
1312 QCOMPARE(lvwph->m_clipItem->clip(), false);
1318 QCOMPARE(lvwph->m_clipItem->clip(), false);
1313 QCOMPARE(lvwph->m_headerItem->y(), 0.);
1319 QCOMPARE(lvwph->m_headerItem->y(), 0.);
@@ -1381,7 +1387,7 @@ private Q_SLOTS:
1381 verifyItem(0, -508., 350., true);
1387 verifyItem(0, -508., 350., true);
1382 verifyItem(1, -158, 350., false);
1388 verifyItem(1, -158, 350., false);
1383 verifyItem(2, 192, 350., false);
1389 verifyItem(2, 192, 350., false);
1384− QCOMPARE(lvwph->m_minYExtent, 0.);
1390+ QCOMPARE(lvwph->m_minYExtent, 350.);
1385 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
1391 QCOMPARE(lvwph->m_clipItem->y(), 1258.);
1386 QCOMPARE(lvwph->m_clipItem->clip(), false);
1392 QCOMPARE(lvwph->m_clipItem->clip(), false);
1387 QCOMPARE(lvwph->m_headerItem->y(), 0.);
1393 QCOMPARE(lvwph->m_headerItem->y(), 0.);