More listview testing and fixing.

4 files changed, 125 insertions, 11 deletions

diff --git a/src/declarative/graphicsitems/qmlgraphicslistview.cpp b/src/declarative/graphicsitems/qmlgraphicslistview.cpp
index a393cb1..efe047a 100644
--- a/src/declarative/graphicsitems/qmlgraphicslistview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicslistview.cpp
@@ -398,7 +398,7 @@ public:
     QmlComponent *highlightComponent;
     FxListItem *highlight;
     FxListItem *trackedItem;
-    enum MovementReason { Other, Key, Mouse };
+    enum MovementReason { Other, SetIndex, Mouse };
     MovementReason moveReason;
     int buffer;
     QmlEaseFollow *highlightPosAnimator;
@@ -422,6 +422,7 @@ void QmlGraphicsListViewPrivate::init()
     q->setFlag(QGraphicsItem::ItemIsFocusScope);
     QObject::connect(q, SIGNAL(heightChanged()), q, SLOT(refill()));
     QObject::connect(q, SIGNAL(widthChanged()), q, SLOT(refill()));
+    QObject::connect(q, SIGNAL(movementEnded()), q, SLOT(animStopped()));
 }
 
 void QmlGraphicsListViewPrivate::clear()
@@ -1178,8 +1179,8 @@ int QmlGraphicsListView::currentIndex() const
 void QmlGraphicsListView::setCurrentIndex(int index)
 {
     Q_D(QmlGraphicsListView);
-    d->moveReason = QmlGraphicsListViewPrivate::Other;
     if (d->isValid() && index != d->currentIndex && index < d->model->count() && index >= 0) {
+        d->moveReason = QmlGraphicsListViewPrivate::SetIndex;
         cancelFlick();
         d->updateCurrent(index);
     } else {
@@ -1516,18 +1517,20 @@ void QmlGraphicsListView::viewportMoved()
     refill();
     if (isFlicking() || d->moving)
         d->moveReason = QmlGraphicsListViewPrivate::Mouse;
-    if (d->moveReason == QmlGraphicsListViewPrivate::Mouse) {
+    if (d->moveReason != QmlGraphicsListViewPrivate::SetIndex) {
         if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange && d->highlight) {
-            int idx = d->snapIndex();
-            if (idx >= 0 && idx != d->currentIndex)
-                d->updateCurrent(idx);
-
-            qreal pos = d->currentItem->position();
+            // reposition highlight
+            qreal pos = d->highlight->position();
             if (pos > d->position() + d->highlightRangeEnd - 1 - d->highlight->size())
                 pos = d->position() + d->highlightRangeEnd - 1 - d->highlight->size();
             if (pos < d->position() + d->highlightRangeStart)
                 pos = d->position() + d->highlightRangeStart;
             d->highlight->setPosition(pos);
+
+            // update current index
+            int idx = d->snapIndex();
+            if (idx >= 0 && idx != d->currentIndex)
+                d->updateCurrent(idx);
         }
     }
 }
@@ -1599,7 +1602,6 @@ void QmlGraphicsListView::keyPressEvent(QKeyEvent *event)
         if ((d->orient == QmlGraphicsListView::Horizontal && event->key() == Qt::Key_Left)
                     || (d->orient == QmlGraphicsListView::Vertical && event->key() == Qt::Key_Up)) {
             if (currentIndex() > 0 || (d->wrap && !event->isAutoRepeat())) {
-                d->moveReason = QmlGraphicsListViewPrivate::Key;
                 decrementCurrentIndex();
                 event->accept();
                 return;
@@ -1610,7 +1612,6 @@ void QmlGraphicsListView::keyPressEvent(QKeyEvent *event)
         } else if ((d->orient == QmlGraphicsListView::Horizontal && event->key() == Qt::Key_Right)
                     || (d->orient == QmlGraphicsListView::Vertical && event->key() == Qt::Key_Down)) {
             if (currentIndex() < d->model->count() - 1 || (d->wrap && !event->isAutoRepeat())) {
-                d->moveReason = QmlGraphicsListViewPrivate::Key;
                 incrementCurrentIndex();
                 event->accept();
                 return;
@@ -1634,6 +1635,7 @@ void QmlGraphicsListView::incrementCurrentIndex()
 {
     Q_D(QmlGraphicsListView);
     if (currentIndex() < d->model->count() - 1 || d->wrap) {
+        d->moveReason = QmlGraphicsListViewPrivate::SetIndex;
         int index = currentIndex()+1;
         cancelFlick();
         d->updateCurrent(index < d->model->count() ? index : 0);
@@ -1650,6 +1652,7 @@ void QmlGraphicsListView::decrementCurrentIndex()
 {
     Q_D(QmlGraphicsListView);
     if (currentIndex() > 0 || d->wrap) {
+        d->moveReason = QmlGraphicsListViewPrivate::SetIndex;
         int index = currentIndex()-1;
         cancelFlick();
         d->updateCurrent(index >= 0 ? index : d->model->count()-1);
@@ -2024,6 +2027,12 @@ void QmlGraphicsListView::destroyingItem(QmlGraphicsItem *item)
     d->unrequestedItems.remove(item);
 }
 
+void QmlGraphicsListView::animStopped()
+{
+    Q_D(QmlGraphicsListView);
+    d->moveReason = QmlGraphicsListViewPrivate::Other;
+}
+
 QmlGraphicsListViewAttached *QmlGraphicsListView::qmlAttachedProperties(QObject *obj)
 {
     return QmlGraphicsListViewAttached::properties(obj);
diff --git a/src/declarative/graphicsitems/qmlgraphicslistview_p.h b/src/declarative/graphicsitems/qmlgraphicslistview_p.h
index 115cad9..446d71a 100644
--- a/src/declarative/graphicsitems/qmlgraphicslistview_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicslistview_p.h
@@ -174,6 +174,7 @@ private Q_SLOTS:
     void destroyRemoved();
     void createdItem(int index, QmlGraphicsItem *item);
     void destroyingItem(QmlGraphicsItem *item);
+    void animStopped();
 };
 
 QT_END_NAMESPACE
diff --git a/tests/auto/declarative/listview/data/listview-enforcerange.qml b/tests/auto/declarative/listview/data/listview-enforcerange.qml
new file mode 100644
index 0000000..46fddae
--- /dev/null
+++ b/tests/auto/declarative/listview/data/listview-enforcerange.qml
@@ -0,0 +1,55 @@
+import Qt 4.6
+
+Rectangle {
+    width: 240
+    height: 320
+    color: "#ffffff"
+    Component {
+        id: myDelegate
+        Item {
+            id: wrapper
+            objectName: "wrapper"
+            height: 20
+            width: 240
+            Text {
+                text: index
+            }
+            Text {
+                x: 30
+                id: textName
+                objectName: "textName"
+                text: name
+            }
+            Text {
+                x: 120
+                id: textNumber
+                objectName: "textNumber"
+                text: number
+            }
+            Text {
+                x: 200
+                text: wrapper.y
+            }
+        }
+    }
+
+    Component {
+        id: myHighlight
+        Rectangle {
+            color: "lightsteelblue"
+        }
+    }
+        
+    ListView {
+        id: list
+        objectName: "list"
+        width: 240
+        height: 320
+        model: testModel
+        delegate: myDelegate
+        highlight: myHighlight
+        preferredHighlightBegin: 100
+        preferredHighlightEnd: 100
+        highlightRangeMode: "StrictlyEnforceRange"
+    }
+}
diff --git a/tests/auto/declarative/listview/tst_listview.cpp b/tests/auto/declarative/listview/tst_listview.cpp
index e61dd55..6bf1080 100644
--- a/tests/auto/declarative/listview/tst_listview.cpp
+++ b/tests/auto/declarative/listview/tst_listview.cpp
@@ -69,6 +69,8 @@ private slots:
     void qListModelInterface_moved();
     void qAbstractItemModel_moved();
 
+    void enforceRange();
+
 private:
     template <class T> void items();
     template <class T> void changed();
@@ -239,12 +241,13 @@ void tst_QmlGraphicsListView::items()
     canvas->execute();
     qApp->processEvents();
 
-    QmlGraphicsFlickable *listview = findItem<QmlGraphicsFlickable>(canvas->root(), "list");
+    QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->root(), "list");
     QVERIFY(listview != 0);
 
     QmlGraphicsItem *viewport = listview->viewport();
     QVERIFY(viewport != 0);
 
+    QCOMPARE(listview->count(), model.count());
     QCOMPARE(viewport->childItems().count(), model.count()+1); // assumes all are visible, +1 for the (default) highlight item
 
     for (int i = 0; i < model.count(); ++i) {
@@ -256,6 +259,11 @@ void tst_QmlGraphicsListView::items()
         QCOMPARE(number->text(), model.number(i));
     }
 
+    listview->incrementCurrentIndex();
+    QCOMPARE(listview->currentIndex(), 1);
+    listview->decrementCurrentIndex();
+    QCOMPARE(listview->currentIndex(), 0);
+
     delete canvas;
 }
 
@@ -583,6 +591,47 @@ void tst_QmlGraphicsListView::moved()
     delete canvas;
 }
 
+void tst_QmlGraphicsListView::enforceRange()
+{
+    QmlView *canvas = createView(SRCDIR "/data/listview-enforcerange.qml");
+
+    TestModel model;
+    for (int i = 0; i < 30; i++)
+        model.addItem("Item" + QString::number(i), "");
+
+    QmlContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+
+    canvas->execute();
+    qApp->processEvents();
+
+    QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->root(), "list");
+    QVERIFY(listview != 0);
+
+    QmlGraphicsItem *viewport = listview->viewport();
+    QVERIFY(viewport != 0);
+
+    // view should be positioned at the top of the range.
+    QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", 0);
+    QVERIFY(item);
+    QCOMPARE(listview->viewportY(), -100.0);
+
+    QmlGraphicsText *name = findItem<QmlGraphicsText>(viewport, "textName", 0);
+    QVERIFY(name != 0);
+    QCOMPARE(name->text(), model.name(0));
+    QmlGraphicsText *number = findItem<QmlGraphicsText>(viewport, "textNumber", 0);
+    QVERIFY(number != 0);
+    QCOMPARE(number->text(), model.number(0));
+
+    // Check currentIndex is updated when viewport moves
+    listview->setViewportY(20);
+    QTest::qWait(1000);
+
+    QCOMPARE(listview->currentIndex(), 6);
+
+    delete canvas;
+}
+
 void tst_QmlGraphicsListView::qListModelInterface_items()
 {
     items<TestModel>();