Don't create a separate section header for currentItem

The currentItem FxViewItem contained it's own section item,
which when created would cause the current item delegate
to be repositioned.  This change associates the section item
with the delegate item, via the attached object.

Change-Id: Ie675d545539b56d0f1cf5a9b4ea26668978a5e72
Reviewed-by: Bea Lam <bea.lam@nokia.com>

2 files changed, 142 insertions, 3 deletions

diff --git a/tests/auto/qtquick2/qquicklistview/data/sectionpropertychange.qml b/tests/auto/qtquick2/qquicklistview/data/sectionpropertychange.qml
new file mode 100644
index 0000000000..f4679b5af0
--- /dev/null
+++ b/tests/auto/qtquick2/qquicklistview/data/sectionpropertychange.qml
@@ -0,0 +1,92 @@
+import QtQuick 2.0
+
+Rectangle {
+    width: 320; height: 480
+
+    Rectangle {
+        id: groupButtons
+        width: 300; height: 30
+        color: "yellow"
+        border.width: 1
+        Text {
+            anchors.centerIn: parent
+            text: "swap"
+        }
+        anchors {
+            top: parent.top
+            horizontalCenter: parent.horizontalCenter
+        }
+        MouseArea {
+            anchors.fill: parent
+            onClicked: switchGroups()
+        }
+    }
+
+    function switchGroups() {
+        if ("title" === myListView.groupBy)
+            myListView.groupBy = "genre"
+        else
+            myListView.groupBy = "title"
+    }
+
+    Component.onCompleted: {
+        myListView.model = generateModel(myListView)
+    }
+
+    ListView {
+        id: myListView
+        objectName: "list"
+
+        clip: true
+        property string groupBy: "title"
+
+        anchors {
+            top: groupButtons.bottom
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+
+        delegate: Item {
+            objectName: "wrapper"
+            height: 50
+            width: 320
+            Text { id: t; text: model.title }
+            Text { text: model.author; font.pixelSize: 10; anchors.top: t.bottom }
+            Text { text: parent.y; anchors.right: parent.right }
+        }
+
+        onGroupByChanged: {
+            model.move(0,1,1)
+            section.property = groupBy
+        }
+
+        section {
+            criteria: ViewSection.FullString
+            delegate: Rectangle { width: 320; height: 25; color: "lightblue"
+                objectName: "sect"
+                Text {text: section }
+                Text { text: parent.y; anchors.right: parent.right }
+            }
+            property: "title"
+        }
+    }
+
+    function generateModel(theParent)
+    {
+        var books = [
+                    { "author": "Billy Bob", "genre": "Anarchism", "title": "Frogs and Love" },
+                    { "author": "Lefty Smith", "genre": "Horror", "title": "Chainsaws for Noobs" }
+                ];
+
+        var model = Qt.createQmlObject("import QtQuick 2.0; ListModel {}", theParent);
+
+        for (var i = 0; i < books.length; ++i) {
+            var book = books[i];
+            model.append(book);
+        }
+        return model;
+    }
+
+}
+
diff --git a/tests/auto/qtquick2/qquicklistview/tst_qquicklistview.cpp b/tests/auto/qtquick2/qquicklistview/tst_qquicklistview.cpp
index 959bb2b265..253df3295f 100644
--- a/tests/auto/qtquick2/qquicklistview/tst_qquicklistview.cpp
+++ b/tests/auto/qtquick2/qquicklistview/tst_qquicklistview.cpp
@@ -125,6 +125,7 @@ private slots:
     void qAbstractItemModel_sections();
     void sectionsPositioning();
     void sectionsDelegate();
+    void sectionPropertyChange();
     void cacheBuffer();
     void positionViewAtIndex();
     void resetModel();
@@ -2095,9 +2096,9 @@ void tst_QQuickListView::sectionsPositioning()
     QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
     model.removeItem(5);
     QTRY_COMPARE(listview->count(), model.count());
-    for (int i = 0; i < 3; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem,
-                "sect_" + (i == 0 ? QString("aaa") : QString::number(i)));
+    for (int i = 1; i < 3; ++i) {
+        QQuickItem *item = findVisibleChild(contentItem,
+                "sect_" + QString::number(i));
         QVERIFY(item);
         QTRY_COMPARE(item->y(), qreal(i*20*6));
     }
@@ -2135,6 +2136,52 @@ void tst_QQuickListView::sectionsPositioning()
     delete canvas;
 }
 
+void tst_QQuickListView::sectionPropertyChange()
+{
+    QQuickView *canvas = createView();
+
+    canvas->setSource(testFileUrl("sectionpropertychange.qml"));
+    canvas->show();
+    qApp->processEvents();
+
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
+    QTRY_VERIFY(listview != 0);
+
+    QQuickItem *contentItem = listview->contentItem();
+    QTRY_VERIFY(contentItem != 0);
+
+    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+
+    // Confirm items positioned correctly
+    for (int i = 0; i < 2; ++i) {
+        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
+        QTRY_VERIFY(item);
+        QTRY_COMPARE(item->y(), qreal(25. + i*75.));
+    }
+
+    QMetaObject::invokeMethod(canvas->rootObject(), "switchGroups");
+    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+
+    // Confirm items positioned correctly
+    for (int i = 0; i < 2; ++i) {
+        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
+        QTRY_VERIFY(item);
+        QTRY_COMPARE(item->y(), qreal(25. + i*75.));
+    }
+
+    QMetaObject::invokeMethod(canvas->rootObject(), "switchGroups");
+    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+
+    // Confirm items positioned correctly
+    for (int i = 0; i < 2; ++i) {
+        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
+        QTRY_VERIFY(item);
+        QTRY_COMPARE(item->y(), qreal(25. + i*75.));
+    }
+
+    delete canvas;
+}
+
 void tst_QQuickListView::currentIndex_delayedItemCreation()
 {
     QFETCH(bool, setCurrentToZero);