Merge lp:~aacid/unity8/lvwph_weirdness2 into lp:unity8

[Albert Astals Cid]

Make sure minYExtent is updated before setting the new content height

Otherwise bad things can happen in the positioning

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:209
http://jenkins.qa.ubuntu.com/job/unity8-ci/665/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2331
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1144
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/666
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/666/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/665
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2337
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2337/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1981

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/665/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'plugins/ListViewWithPageHeader/listviewwithpageheader.cpp'
--- plugins/ListViewWithPageHeader/listviewwithpageheader.cpp	2013-08-14 11:05:58 +0000
+++ plugins/ListViewWithPageHeader/listviewwithpageheader.cpp	2013-08-16 16:32:30 +0000
@@ -1244,6 +1244,7 @@
         }
 
         m_contentHeightDirty = false;
+        adjustMinYExtent();
         setContentHeight(contentHeight);
     }
 }
 
=== modified file 'tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp'
--- tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp	2013-08-08 15:34:52 +0000
+++ tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp	2013-08-16 16:32:30 +0000
@@ -19,6 +19,7 @@
 #include <QAbstractItemModel>
 #include <QQmlEngine>
 #include <QQuickView>
+#include <QSignalSpy>
 #include <QtTestGui>
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-pedantic"
@@ -1521,7 +1522,7 @@
         QCOMPARE(lvwph->m_firstVisibleIndex, 1);
         verifyItem(0, -458., 1000., false);
         verifyItem(1, 542., 350., true);
-        QCOMPARE(lvwph->m_minYExtent, 362.5);
+        QCOMPARE(lvwph->m_minYExtent, 525.);
         QCOMPARE(lvwph->m_clipItem->y(), 658.);
         QCOMPARE(lvwph->m_clipItem->clip(), false);
         QCOMPARE(lvwph->m_headerItem->y(), 0.);
@@ -1634,6 +1635,26 @@
         QCOMPARE(lvwph->m_headerItemShownHeight, 0.);
     }
 
+    void addingRemoveItemsShouldNotChangeContentY()
+    {
+        QSignalSpy spy(lvwph, SIGNAL(contentYChanged()));
+        QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 0), Q_ARG(QVariant, 150));
+        QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 1), Q_ARG(QVariant, 6));
+
+        QTRY_COMPARE(lvwph->m_visibleItems.count(), 1);
+        QCOMPARE(lvwph->m_firstVisibleIndex, 0);
+        verifyItem(0, 50., 150., false);
+        QCOMPARE(lvwph->m_minYExtent, 0.);
+        QCOMPARE(lvwph->m_clipItem->y(), 0.);
+        QCOMPARE(lvwph->m_clipItem->clip(), false);
+        QCOMPARE(lvwph->m_headerItem->y(), 0.);
+        QCOMPARE(lvwph->m_headerItem->height(), 50.);
+        QCOMPARE(lvwph->contentY(), 0.);
+        QCOMPARE(lvwph->m_headerItemShownHeight, 0.);
+
+        QCOMPARE(spy.count(), 0);
+    }
+
 private:
     QQuickView *view;
     ListViewWithPageHeader *lvwph;
 
=== modified file 'tests/plugins/ListViewWithPageHeader/listviewwithpageheadertestsection.cpp'
--- tests/plugins/ListViewWithPageHeader/listviewwithpageheadertestsection.cpp	2013-08-08 15:34:52 +0000
+++ tests/plugins/ListViewWithPageHeader/listviewwithpageheadertestsection.cpp	2013-08-16 16:32:30 +0000
@@ -19,6 +19,7 @@
 #include <QAbstractItemModel>
 #include <QQmlEngine>
 #include <QQuickView>
+#include <QSignalSpy>
 #include <QtTestGui>
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-pedantic"
@@ -1875,7 +1876,7 @@
         QCOMPARE(lvwph->m_firstVisibleIndex, 1);
         verifyItem(0, -498., 1040., false, "Regular", true);
         verifyItem(1, 542., 390., true, "Mild", true);
-        QCOMPARE(lvwph->m_minYExtent, 1250/3.);
+        QCOMPARE(lvwph->m_minYExtent, 525.);
         QCOMPARE(lvwph->m_clipItem->y(), 738.);
         QCOMPARE(lvwph->m_clipItem->clip(), false);
         QCOMPARE(lvwph->m_headerItem->y(), 0.);
@@ -2055,6 +2056,26 @@
         QCOMPARE(lvwph->m_headerItemShownHeight, 0.);
     }
 
+    void addingRemoveItemsShouldNotChangeContentY()
+    {
+        QSignalSpy spy(lvwph, SIGNAL(contentYChanged()));
+        QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 0), Q_ARG(QVariant, 150), Q_ARG(QVariant, "Agressive"));
+        QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 1), Q_ARG(QVariant, 6));
+
+        QTRY_COMPARE(lvwph->m_visibleItems.count(), 1);
+        QCOMPARE(lvwph->m_firstVisibleIndex, 0);
+        verifyItem(0, 50., 190., false, "Agressive", false);
+        QCOMPARE(lvwph->m_minYExtent, 0.);
+        QCOMPARE(lvwph->m_clipItem->y(), 0.);
+        QCOMPARE(lvwph->m_clipItem->clip(), false);
+        QCOMPARE(lvwph->m_headerItem->y(), 0.);
+        QCOMPARE(lvwph->m_headerItem->height(), 50.);
+        QCOMPARE(lvwph->contentY(), 0.);
+        QCOMPARE(lvwph->m_headerItemShownHeight, 0.);
+
+        QCOMPARE(spy.count(), 0);
+    }
+
 private:
     QQuickView *view;
     ListViewWithPageHeader *lvwph;