Fix PathView not updating after all items are removed from the model.

Always clear the layoutScheduled flag on a refill even if there are no
items to create, otherwise future layouts won't be scheduled because
it appears one is already pending.

Fixes an issue in the dragselection example where items that should
have moved to the PathView instead disappeared.

Change-Id: I4302b5b43184c697a78f5c09dc3811326e2271ca
Reviewed-by: Martin Jones <martin.jones@nokia.com>

6 files changed, 134 insertions, 4 deletions

diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
index 2a674050a0..8d4453a6e0 100644
--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
@@ -46,7 +46,6 @@
 #include <QtQml/qqmlcontext.h>
 #include <QtQml/qqmlexpression.h>
 #include <QtQml/qqmlincubator.h>
-#include <QtQuick/private/qquickitem_p.h>
 #include <QtQuick/private/qquicklistview_p.h>
 #include <QtQuick/private/qquicktext_p.h>
 #include <QtQuick/private/qquickvisualitemmodel_p.h>
diff --git a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
index 057eb2cb64..ec863d8f1a 100644
--- a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
+++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
@@ -63,6 +63,7 @@
 using namespace QQuickViewTestUtil;
 using namespace QQuickVisualTestUtil;
 
+Q_DECLARE_METATYPE(QQuickPathView::HighlightRangeMode)
 
 static void initStandardTreeModel(QStandardItemModel *model)
 {
@@ -101,6 +102,8 @@ private slots:
     void removeModel();
     void moveModel_data();
     void moveModel();
+    void consecutiveModelChanges_data();
+    void consecutiveModelChanges();
     void path();
     void pathMoved();
     void setCurrentIndex();
@@ -529,6 +532,127 @@ void tst_QQuickPathView::moveModel()
     delete canvas;
 }
 
+void tst_QQuickPathView::consecutiveModelChanges_data()
+{
+    QTest::addColumn<QQuickPathView::HighlightRangeMode>("mode");
+    QTest::addColumn<QList<ListChange> >("changes");
+    QTest::addColumn<int>("count");
+    QTest::addColumn<qreal>("offset");
+
+    QTest::newRow("no range - insert after, insert before")
+            << QQuickPathView::NoHighlightRange
+            << (QList<ListChange>()
+                << ListChange::insert(7, 2)
+                << ListChange::insert(1, 3))
+            << 13
+            << 6.;
+    QTest::newRow("no range - remove after, remove before")
+            << QQuickPathView::NoHighlightRange
+            << (QList<ListChange>()
+                << ListChange::remove(6, 2)
+                << ListChange::remove(1, 3))
+            << 3
+            << 2.;
+
+    QTest::newRow("no range - remove after, insert before")
+            << QQuickPathView::NoHighlightRange
+            << (QList<ListChange>()
+                << ListChange::remove(5, 2)
+                << ListChange::insert(1, 3))
+            << 9
+            << 2.;
+
+    QTest::newRow("no range - insert after, remove before")
+            << QQuickPathView::NoHighlightRange
+            << (QList<ListChange>()
+                << ListChange::insert(6, 2)
+                << ListChange::remove(1, 3))
+            << 7
+            << 6.;
+
+    QTest::newRow("no range - insert, remove all, polish, insert")
+            << QQuickPathView::NoHighlightRange
+            << (QList<ListChange>()
+                << ListChange::insert(3, 1)
+                << ListChange::remove(0, 9)
+                << ListChange::polish()
+                << ListChange::insert(0, 3))
+            << 3
+            << 0.;
+}
+
+void tst_QQuickPathView::consecutiveModelChanges()
+{
+    QFETCH(QQuickPathView::HighlightRangeMode, mode);
+    QFETCH(QList<ListChange>, changes);
+    QFETCH(int, count);
+    QFETCH(qreal, offset);
+
+    QQuickView *canvas = createView();
+    canvas->show();
+
+    QaimModel model;
+    model.addItem("Ben", "12345");
+    model.addItem("Bohn", "2345");
+    model.addItem("Bob", "54321");
+    model.addItem("Bill", "4321");
+    model.addItem("Jinny", "679");
+    model.addItem("Milly", "73378");
+    model.addItem("Jimmy", "3535");
+    model.addItem("Barb", "9039");
+
+    QQmlContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+
+    canvas->setSource(testFileUrl("pathview0.qml"));
+    qApp->processEvents();
+
+    QQuickPathView *pathview = findItem<QQuickPathView>(canvas->rootObject(), "view");
+    QVERIFY(pathview != 0);
+
+    pathview->setHighlightRangeMode(mode);
+
+    pathview->setCurrentIndex(4);
+    if (mode == QQuickPathView::StrictlyEnforceRange)
+        QTRY_COMPARE(pathview->offset(), 4.0);
+    else
+        pathview->setOffset(4);
+
+    for (int i=0; i<changes.count(); i++) {
+        switch (changes[i].type) {
+            case ListChange::Inserted:
+            {
+                QList<QPair<QString, QString> > items;
+                for (int j=changes[i].index; j<changes[i].index + changes[i].count; ++j)
+                    items << qMakePair(QString("new item %1").arg(j), QString::number(j));
+                model.insertItems(changes[i].index, items);
+                break;
+            }
+            case ListChange::Removed:
+                model.removeItems(changes[i].index, changes[i].count);
+                break;
+            case ListChange::Moved:
+                model.moveItems(changes[i].index, changes[i].to, changes[i].count);
+                break;
+            case ListChange::SetCurrent:
+                pathview->setCurrentIndex(changes[i].index);
+                break;
+        case ListChange::Polish:
+                QQUICK_VERIFY_POLISH(pathview);
+                break;
+            default:
+                continue;
+        }
+    }
+    QQUICK_VERIFY_POLISH(pathview);
+
+    QCOMPARE(findItems<QQuickItem>(pathview, "wrapper").count(), count);
+    QCOMPARE(pathview->count(), count);
+    QTRY_COMPARE(pathview->offset(), offset);
+
+    delete canvas;
+}
+
 void tst_QQuickPathView::path()
 {
     QQmlEngine engine;
diff --git a/tests/auto/quick/qquickpositioners/qquickpositioners.pro b/tests/auto/quick/qquickpositioners/qquickpositioners.pro
index e4fce55548..2092b1a699 100644
--- a/tests/auto/quick/qquickpositioners/qquickpositioners.pro
+++ b/tests/auto/quick/qquickpositioners/qquickpositioners.pro
@@ -11,4 +11,4 @@ macx:CONFIG -= app_bundle
 TESTDATA = data/*
 
 CONFIG += parallel_test
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += testlib
diff --git a/tests/auto/quick/shared/util.pri b/tests/auto/quick/shared/util.pri
index aa79c7ca98..28036f109c 100644
--- a/tests/auto/quick/shared/util.pri
+++ b/tests/auto/quick/shared/util.pri
@@ -1,4 +1,6 @@
 
+QT += core-private gui-private v8-private qml-private quick-private
+
 HEADERS += $$PWD/visualtestutil.h \
            $$PWD/viewtestutil.h
 SOURCES += $$PWD/visualtestutil.cpp \
diff --git a/tests/auto/quick/shared/viewtestutil.h b/tests/auto/quick/shared/viewtestutil.h
index 06efd9c28e..10ecd6a2ce 100644
--- a/tests/auto/quick/shared/viewtestutil.h
+++ b/tests/auto/quick/shared/viewtestutil.h
@@ -60,7 +60,7 @@ namespace QQuickViewTestUtil
     QList<int> adjustIndexesForRemoveDisplaced(const QList<int> &indexes, int index, int count);
 
     struct ListChange {
-        enum { Inserted, Removed, Moved, SetCurrent, SetContentY } type;
+        enum { Inserted, Removed, Moved, SetCurrent, SetContentY, Polish } type;
         int index;
         int count;
         int to;     // Move
@@ -71,6 +71,7 @@ namespace QQuickViewTestUtil
         static ListChange move(int index, int to, int count) { ListChange c = { Moved, index, count, to, 0.0 }; return c; }
         static ListChange setCurrent(int index) { ListChange c = { SetCurrent, index, -1, -1, 0.0 }; return c; }
         static ListChange setContentY(qreal pos) { ListChange c = { SetContentY, -1, -1, -1, pos }; return c; }
+        static ListChange polish() { ListChange c = { Polish, -1, -1, -1, 0.0 }; return c; }
     };
 
     class QmlListModel : public QListModelInterface
diff --git a/tests/auto/quick/shared/visualtestutil.h b/tests/auto/quick/shared/visualtestutil.h
index 9407ff8e8f..c2fc9cc01f 100644
--- a/tests/auto/quick/shared/visualtestutil.h
+++ b/tests/auto/quick/shared/visualtestutil.h
@@ -45,6 +45,8 @@
 #include <QtQuick/QQuickItem>
 #include <QtQml/QQmlExpression>
 
+#include <QtQuick/private/qquickitem_p.h>
+
 namespace QQuickVisualTestUtil
 {
     QQuickItem *findVisibleChild(QQuickItem *parent, const QString &objectName);
@@ -106,7 +108,9 @@ namespace QQuickVisualTestUtil
             items << qobject_cast<QQuickItem*>(findItem<T>(parent, objectName, indexes[i]));
         return items;
     }
-
 }
 
+#define QQUICK_VERIFY_POLISH(item) \
+    QTRY_COMPARE(QQuickItemPrivate::get(item)->polishScheduled, false)
+
 #endif // QQUICKVISUALTESTUTIL_H