aa1e99e · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

LVWPH: Make sure we always overshoot vertically. Fixes: https://bugs.launchpad.net/bugs/1229851.

aa1e99eAlbert Astals13 years ago

plugins/ListViewWithPageHeader/listviewwithpageheader.cpp+2

compare with xenial

unifiedsplit

@@ -170,6 +170,8 @@ ListViewWithPageHeader::ListViewWithPageHeader()

170 connect(this, SIGNAL(contentHeightChanged()), this, SLOT(onContentHeightChanged()));

171 connect(this, SIGNAL(heightChanged()), this, SLOT(onHeightChanged()));

172 connect(m_contentYAnimation, SIGNAL(stopped()), this, SLOT(onShowHeaderAnimationFinished()));

173+

174+ setFlickableDirection(VerticalFlick);

173}

175}

174

176

175ListViewWithPageHeader::~ListViewWithPageHeader()

177ListViewWithPageHeader::~ListViewWithPageHeader()

tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp+45

@@ -1655,6 +1655,51 @@ private Q_SLOTS:

1655 QCOMPARE(spy.count(), 0);

1656 }

1657

1658+ void testOvershootOnSameSize()

1659+ {

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

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

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

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

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

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

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

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

1668+

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

1670+ QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 0), Q_ARG(QVariant, 392));

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

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

1673+ verifyItem(0, 50., 392., false);

1674+ verifyItem(1, 442., 100., false);

1675+

1676+ QCOMPARE(lvwph->contentHeight(), lvwph->height());

1677+

1678+ QTest::mousePress(view, Qt::LeftButton, Qt::NoModifier, QPoint(0, 0));

1679+ QTest::qWait(100);

1680+ QTest::mouseMove(view, QPoint(0, 5));

1681+ QTest::qWait(100);

1682+ QTest::mouseMove(view, QPoint(0, 10));

1683+ QTest::qWait(100);

1684+ QTest::mouseMove(view, QPoint(0, 15));

1685+ QTest::qWait(100);

1686+ QTest::mouseMove(view, QPoint(0, 20));

1687+ QTest::qWait(100);

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

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

1690+ verifyItem(0, 55., 392., false);

1691+ verifyItem(1, 447., 100., false);

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

1693+ QCOMPARE(lvwph->m_clipItem->y(), -5.);

1694+

1695+ QTest::mouseRelease(view, Qt::LeftButton, Qt::NoModifier, QPoint(0, 15));

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

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

1698+ verifyItem(0, 50., 392., false);

1699+ verifyItem(1, 442., 100., false);

1700+ }

1701+

1702+

1658private:

1703private:

1659 QQuickView *view;

1704 QQuickView *view;

1660 ListViewWithPageHeader *lvwph;

1705 ListViewWithPageHeader *lvwph;