Ensure the view is correctly positioned at component complete.

If a currentIndex has been specified, ensure the view starts at the
correct position immediately, rather than scrolling to it after
startup.

6 files changed, 65 insertions, 45 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index 3792595..8e53237 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -2037,6 +2037,8 @@ void QDeclarativeGridView::positionViewAtIndex(int index, int mode)
     if (mode < Beginning || mode > Contain)
         return;
 
+    if (d->layoutScheduled)
+        d->layout();
     qreal pos = d->position();
     FxGridItem *item = d->visibleItem(index);
     if (!item) {
@@ -2079,6 +2081,8 @@ void QDeclarativeGridView::positionViewAtIndex(int index, int mode)
         pos = qMin(pos, maxExtent);
         qreal minExtent = d->flow == QDeclarativeGridView::LeftToRight ? -minYExtent() : -minXExtent();
         pos = qMax(pos, minExtent);
+        d->moveReason = QDeclarativeGridViewPrivate::Other;
+        cancelFlick();
         d->setPosition(pos);
     }
     d->fixupPosition();
@@ -2113,10 +2117,15 @@ void QDeclarativeGridView::componentComplete()
     d->updateGrid();
     if (d->isValid()) {
         refill();
+        d->moveReason = QDeclarativeGridViewPrivate::SetIndex;
         if (d->currentIndex < 0)
             d->updateCurrent(0);
         else
             d->updateCurrent(d->currentIndex);
+        if (d->highlight) {
+            d->highlight->setPosition(d->currentItem->colPos(), d->currentItem->rowPos());
+            d->updateTrackedItem();
+        }
         d->fixupPosition();
     }
 }
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 06a3239..35e6bab 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -2448,6 +2448,8 @@ void QDeclarativeListView::positionViewAtIndex(int index, int mode)
     if (mode < Beginning || mode > Contain)
         return;
 
+    if (d->layoutScheduled)
+        d->layout();
     qreal pos = d->position();
     FxListItem *item = d->visibleItem(index);
     if (!item) {
@@ -2491,6 +2493,8 @@ void QDeclarativeListView::positionViewAtIndex(int index, int mode)
         pos = qMin(pos, maxExtent);
         qreal minExtent = d->orient == QDeclarativeListView::Vertical ? -minYExtent() : -minXExtent();
         pos = qMax(pos, minExtent);
+        d->moveReason = QDeclarativeListViewPrivate::Other;
+        cancelFlick();
         d->setPosition(pos);
     }
     d->fixupPosition();
@@ -2529,6 +2533,10 @@ void QDeclarativeListView::componentComplete()
             d->updateCurrent(0);
         else
             d->updateCurrent(d->currentIndex);
+        if (d->highlight) {
+            d->highlight->setPosition(d->currentItem->position());
+            d->updateTrackedItem();
+        }
         d->fixupPosition();
     }
 }
diff --git a/tests/auto/declarative/qdeclarativegridview/data/gridview-initCurrent.qml b/tests/auto/declarative/qdeclarativegridview/data/gridview-initCurrent.qml
index 9331243..a5d651d 100644
--- a/tests/auto/declarative/qdeclarativegridview/data/gridview-initCurrent.qml
+++ b/tests/auto/declarative/qdeclarativegridview/data/gridview-initCurrent.qml
@@ -43,7 +43,7 @@ Rectangle {
         focus: true
         width: 240
         height: 320
-        currentIndex: 5
+        currentIndex: 35
         cellWidth: 80
         cellHeight: 60
         delegate: myDelegate
diff --git a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
index 4e35bc0..deff1f8 100644
--- a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
+++ b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
@@ -557,7 +557,7 @@ void tst_QDeclarativeGridView::moved()
 void tst_QDeclarativeGridView::currentIndex()
 {
     TestModel model;
-    for (int i = 0; i < 30; i++)
+    for (int i = 0; i < 60; i++)
         model.addItem("Item" + QString::number(i), QString::number(i));
 
     QDeclarativeView *canvas = new QDeclarativeView(0);
@@ -572,57 +572,58 @@ void tst_QDeclarativeGridView::currentIndex()
     qApp->processEvents();
 
     QDeclarativeGridView *gridview = findItem<QDeclarativeGridView>(canvas->rootObject(), "grid");
-    QTRY_VERIFY(gridview != 0);
+    QVERIFY(gridview != 0);
 
     QDeclarativeItem *viewport = gridview->viewport();
-    QTRY_VERIFY(viewport != 0);
+    QVERIFY(viewport != 0);
 
     // current item should be third item
-    QTRY_COMPARE(gridview->currentIndex(), 5);
-    QTRY_COMPARE(gridview->currentItem(), findItem<QDeclarativeItem>(viewport, "wrapper", 5));
-    QTRY_COMPARE(gridview->currentItem()->y(), gridview->highlightItem()->y());
+    QCOMPARE(gridview->currentIndex(), 35);
+    QCOMPARE(gridview->currentItem(), findItem<QDeclarativeItem>(viewport, "wrapper", 35));
+    QCOMPARE(gridview->currentItem()->y(), gridview->highlightItem()->y());
+    QCOMPARE(gridview->contentY(), 399.0);
 
     gridview->moveCurrentIndexRight();
-    QTRY_COMPARE(gridview->currentIndex(), 6);
+    QCOMPARE(gridview->currentIndex(), 36);
     gridview->moveCurrentIndexDown();
-    QTRY_COMPARE(gridview->currentIndex(), 9);
+    QCOMPARE(gridview->currentIndex(), 39);
     gridview->moveCurrentIndexUp();
-    QTRY_COMPARE(gridview->currentIndex(), 6);
+    QCOMPARE(gridview->currentIndex(), 36);
     gridview->moveCurrentIndexLeft();
-    QTRY_COMPARE(gridview->currentIndex(), 5);
+    QCOMPARE(gridview->currentIndex(), 35);
 
     // no wrap
     gridview->setCurrentIndex(0);
-    QTRY_COMPARE(gridview->currentIndex(), 0);
+    QCOMPARE(gridview->currentIndex(), 0);
 
     gridview->moveCurrentIndexUp();
-    QTRY_COMPARE(gridview->currentIndex(), 0);
+    QCOMPARE(gridview->currentIndex(), 0);
 
     gridview->moveCurrentIndexLeft();
-    QTRY_COMPARE(gridview->currentIndex(), 0);
+    QCOMPARE(gridview->currentIndex(), 0);
 
     gridview->setCurrentIndex(model.count()-1);
-    QTRY_COMPARE(gridview->currentIndex(), model.count()-1);
+    QCOMPARE(gridview->currentIndex(), model.count()-1);
 
     gridview->moveCurrentIndexRight();
-    QTRY_COMPARE(gridview->currentIndex(), model.count()-1);
+    QCOMPARE(gridview->currentIndex(), model.count()-1);
 
     gridview->moveCurrentIndexDown();
-    QTRY_COMPARE(gridview->currentIndex(), model.count()-1);
+    QCOMPARE(gridview->currentIndex(), model.count()-1);
 
     // with wrap
     gridview->setWrapEnabled(true);
 
     gridview->setCurrentIndex(0);
-    QTRY_COMPARE(gridview->currentIndex(), 0);
+    QCOMPARE(gridview->currentIndex(), 0);
 
     gridview->moveCurrentIndexLeft();
-    QTRY_COMPARE(gridview->currentIndex(), model.count()-1);
+    QCOMPARE(gridview->currentIndex(), model.count()-1);
 
-    QTRY_COMPARE(gridview->contentY(), 279.0);
+    QTRY_COMPARE(gridview->contentY(), 879.0);
 
     gridview->moveCurrentIndexRight();
-    QTRY_COMPARE(gridview->currentIndex(), 0);
+    QCOMPARE(gridview->currentIndex(), 0);
 
     QTRY_COMPARE(gridview->contentY(), 0.0);
 
@@ -638,30 +639,30 @@ void tst_QDeclarativeGridView::currentIndex()
     qApp->processEvents();
 
     QTest::keyClick(canvas, Qt::Key_Down);
-    QTRY_COMPARE(gridview->currentIndex(), 3);
+    QCOMPARE(gridview->currentIndex(), 3);
 
     QTest::keyClick(canvas, Qt::Key_Up);
-    QTRY_COMPARE(gridview->currentIndex(), 0);
+    QCOMPARE(gridview->currentIndex(), 0);
 
     gridview->setFlow(QDeclarativeGridView::TopToBottom);
 
     QTest::keyClick(canvas, Qt::Key_Right);
-    QTRY_COMPARE(gridview->currentIndex(), 5);
+    QCOMPARE(gridview->currentIndex(), 5);
 
     QTest::keyClick(canvas, Qt::Key_Left);
-    QTRY_COMPARE(gridview->currentIndex(), 0);
+    QCOMPARE(gridview->currentIndex(), 0);
 
     QTest::keyClick(canvas, Qt::Key_Down);
-    QTRY_COMPARE(gridview->currentIndex(), 1);
+    QCOMPARE(gridview->currentIndex(), 1);
 
     QTest::keyClick(canvas, Qt::Key_Up);
-    QTRY_COMPARE(gridview->currentIndex(), 0);
+    QCOMPARE(gridview->currentIndex(), 0);
 
 
     // turn off auto highlight
     gridview->setHighlightFollowsCurrentItem(false);
-    QTRY_VERIFY(gridview->highlightFollowsCurrentItem() == false);
-    QTRY_VERIFY(gridview->highlightItem());
+    QVERIFY(gridview->highlightFollowsCurrentItem() == false);
+    QVERIFY(gridview->highlightItem());
     qreal hlPosX = gridview->highlightItem()->x();
     qreal hlPosY = gridview->highlightItem()->y();
 
diff --git a/tests/auto/declarative/qdeclarativelistview/data/listview-initCurrent.qml b/tests/auto/declarative/qdeclarativelistview/data/listview-initCurrent.qml
index 0599ddd..f3c2910 100644
--- a/tests/auto/declarative/qdeclarativelistview/data/listview-initCurrent.qml
+++ b/tests/auto/declarative/qdeclarativelistview/data/listview-initCurrent.qml
@@ -40,7 +40,7 @@ Rectangle {
         id: list
         objectName: "list"
         focus: true
-        currentIndex: 3
+        currentIndex: 20
         width: 240
         height: 320
         keyNavigationWraps: testWrap
diff --git a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
index cd42b63..8ff6e56 100644
--- a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
+++ b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
@@ -973,34 +973,36 @@ void tst_QDeclarativeListView::currentIndex()
     QDeclarativeItem *viewport = listview->viewport();
     QTRY_VERIFY(viewport != 0);
 
-    // current item should be third item
-    QTRY_COMPARE(listview->currentIndex(), 3);
-    QTRY_COMPARE(listview->currentItem(), findItem<QDeclarativeItem>(viewport, "wrapper", 3));
-    QTRY_COMPARE(listview->highlightItem()->y(), listview->currentItem()->y());
+    // current item should be 20th item at startup
+    // and current item should be in view
+    QCOMPARE(listview->currentIndex(), 20);
+    QCOMPARE(listview->contentY(), 99.0);
+    QCOMPARE(listview->currentItem(), findItem<QDeclarativeItem>(viewport, "wrapper", 20));
+    QCOMPARE(listview->highlightItem()->y(), listview->currentItem()->y());
 
     // no wrap
     listview->setCurrentIndex(0);
-    QTRY_COMPARE(listview->currentIndex(), 0);
+    QCOMPARE(listview->currentIndex(), 0);
 
     listview->incrementCurrentIndex();
-    QTRY_COMPARE(listview->currentIndex(), 1);
+    QCOMPARE(listview->currentIndex(), 1);
     listview->decrementCurrentIndex();
-    QTRY_COMPARE(listview->currentIndex(), 0);
+    QCOMPARE(listview->currentIndex(), 0);
 
     listview->decrementCurrentIndex();
-    QTRY_COMPARE(listview->currentIndex(), 0);
+    QCOMPARE(listview->currentIndex(), 0);
 
     // with wrap
     ctxt->setContextProperty("testWrap", QVariant(true));
-    QTRY_VERIFY(listview->isWrapEnabled());
+    QVERIFY(listview->isWrapEnabled());
 
     listview->decrementCurrentIndex();
-    QTRY_COMPARE(listview->currentIndex(), model.count()-1);
+    QCOMPARE(listview->currentIndex(), model.count()-1);
 
     QTRY_COMPARE(listview->contentY(), 279.0);
 
     listview->incrementCurrentIndex();
-    QTRY_COMPARE(listview->currentIndex(), 0);
+    QCOMPARE(listview->currentIndex(), 0);
 
     QTRY_COMPARE(listview->contentY(), 0.0);
 
@@ -1016,16 +1018,16 @@ void tst_QDeclarativeListView::currentIndex()
     qApp->processEvents();
 
     QTest::keyClick(canvas, Qt::Key_Down);
-    QTRY_COMPARE(listview->currentIndex(), 1);
+    QCOMPARE(listview->currentIndex(), 1);
 
     QTest::keyClick(canvas, Qt::Key_Up);
-    QTRY_COMPARE(listview->currentIndex(), 0);
+    QCOMPARE(listview->currentIndex(), 0);
 
     // turn off auto highlight
     listview->setHighlightFollowsCurrentItem(false);
-    QTRY_VERIFY(listview->highlightFollowsCurrentItem() == false);
+    QVERIFY(listview->highlightFollowsCurrentItem() == false);
 
-    QTRY_VERIFY(listview->highlightItem());
+    QVERIFY(listview->highlightItem());
     qreal hlPos = listview->highlightItem()->y();
 
     listview->setCurrentIndex(4);