Changing header or footer failed to delete the previous.

Also ensure that the view is repositioned if the change of header
results in the view being out of bounds.

Task-number: QTBUG-16522
Reviewed-by: Michael Brasser

8 files changed, 108 insertions, 1 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index 6a6ff64..9aade98 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -1779,6 +1779,9 @@ void QDeclarativeGridView::setFooter(QDeclarativeComponent *footer)
     Q_D(QDeclarativeGridView);
     if (d->footerComponent != footer) {
         if (d->footer) {
+            if (scene())
+                scene()->removeItem(d->footer->item);
+            d->footer->item->deleteLater();
             delete d->footer;
             d->footer = 0;
         }
@@ -1786,6 +1789,7 @@ void QDeclarativeGridView::setFooter(QDeclarativeComponent *footer)
         if (isComponentComplete()) {
             d->updateFooter();
             d->updateGrid();
+            d->fixupPosition();
         }
         emit footerChanged();
     }
@@ -1811,6 +1815,9 @@ void QDeclarativeGridView::setHeader(QDeclarativeComponent *header)
     Q_D(QDeclarativeGridView);
     if (d->headerComponent != header) {
         if (d->header) {
+            if (scene())
+                scene()->removeItem(d->header->item);
+            d->header->item->deleteLater();
             delete d->header;
             d->header = 0;
         }
@@ -1819,6 +1826,7 @@ void QDeclarativeGridView::setHeader(QDeclarativeComponent *header)
             d->updateHeader();
             d->updateFooter();
             d->updateGrid();
+            d->fixupPosition();
         }
         emit headerChanged();
     }
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index cbc4311..075c3af 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -2232,6 +2232,9 @@ void QDeclarativeListView::setFooter(QDeclarativeComponent *footer)
     Q_D(QDeclarativeListView);
     if (d->footerComponent != footer) {
         if (d->footer) {
+            if (scene())
+                scene()->removeItem(d->footer->item);
+            d->footer->item->deleteLater();
             delete d->footer;
             d->footer = 0;
         }
@@ -2241,6 +2244,7 @@ void QDeclarativeListView::setFooter(QDeclarativeComponent *footer)
         if (isComponentComplete()) {
             d->updateFooter();
             d->updateViewport();
+            d->fixupPosition();
         }
         emit footerChanged();
     }
@@ -2266,6 +2270,9 @@ void QDeclarativeListView::setHeader(QDeclarativeComponent *header)
     Q_D(QDeclarativeListView);
     if (d->headerComponent != header) {
         if (d->header) {
+            if (scene())
+                scene()->removeItem(d->header->item);
+            d->header->item->deleteLater();
             delete d->header;
             d->header = 0;
         }
@@ -2276,6 +2283,7 @@ void QDeclarativeListView::setHeader(QDeclarativeComponent *header)
             d->updateHeader();
             d->updateFooter();
             d->updateViewport();
+            d->fixupPosition();
         }
         emit headerChanged();
     }
diff --git a/tests/auto/declarative/qdeclarativegridview/data/footer.qml b/tests/auto/declarative/qdeclarativegridview/data/footer.qml
index ad69a25..b41e2ac 100644
--- a/tests/auto/declarative/qdeclarativegridview/data/footer.qml
+++ b/tests/auto/declarative/qdeclarativegridview/data/footer.qml
@@ -1,6 +1,9 @@
 import QtQuick 1.0
 
 Rectangle {
+    function changeFooter() {
+        grid.footer = footer2
+    }
     width: 240
     height: 320
     color: "#ffffff"
@@ -29,4 +32,9 @@ Rectangle {
         delegate: myDelegate
         footer: Text { objectName: "footer"; text: "Footer"; height: 30 }
     }
+
+    Component {
+        id: footer2
+        Text { objectName: "footer2"; text: "Footer 2"; height: 20 }
+    }
 }
diff --git a/tests/auto/declarative/qdeclarativegridview/data/header.qml b/tests/auto/declarative/qdeclarativegridview/data/header.qml
index 99baacd..f39da55 100644
--- a/tests/auto/declarative/qdeclarativegridview/data/header.qml
+++ b/tests/auto/declarative/qdeclarativegridview/data/header.qml
@@ -1,6 +1,9 @@
 import QtQuick 1.0
 
 Rectangle {
+    function changeHeader() {
+        grid.header = header2
+    }
     width: 240
     height: 320
     color: "#ffffff"
@@ -29,4 +32,9 @@ Rectangle {
         delegate: myDelegate
         header: Text { objectName: "header"; text: "Header"; height: 30 }
     }
+
+    Component {
+        id: header2
+        Text { objectName: "header2"; text: "Header 2"; height: 20 }
+    }
 }
diff --git a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
index a6a8b90..82a1a4a 100644
--- a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
+++ b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
@@ -1370,12 +1370,27 @@ void tst_QDeclarativeGridView::footer()
     QVERIFY(footer);
 
     QCOMPARE(footer->y(), 180.0);
+    QCOMPARE(footer->height(), 30.0);
 
     model.removeItem(2);
     QTRY_COMPARE(footer->y(), 120.0);
 
     model.clear();
     QTRY_COMPARE(footer->y(), 0.0);
+
+    for (int i = 0; i < 30; i++)
+        model.addItem("Item" + QString::number(i), "");
+
+    QMetaObject::invokeMethod(canvas->rootObject(), "changeFooter");
+
+    footer = findItem<QDeclarativeText>(contentItem, "footer");
+    QVERIFY(!footer);
+    footer = findItem<QDeclarativeText>(contentItem, "footer2");
+    QVERIFY(footer);
+
+    QCOMPARE(footer->y(), 0.0);
+    QCOMPARE(footer->height(), 20.0);
+    QCOMPARE(gridview->contentY(), 0.0);
 }
 
 void tst_QDeclarativeGridView::header()
@@ -1402,6 +1417,7 @@ void tst_QDeclarativeGridView::header()
     QVERIFY(header);
 
     QCOMPARE(header->y(), 0.0);
+    QCOMPARE(header->height(), 30.0);
     QCOMPARE(gridview->contentY(), 0.0);
 
     QDeclarativeItem *item = findItem<QDeclarativeItem>(contentItem, "wrapper", 0);
@@ -1410,6 +1426,20 @@ void tst_QDeclarativeGridView::header()
 
     model.clear();
     QTRY_COMPARE(header->y(), 0.0);
+
+    for (int i = 0; i < 30; i++)
+        model.addItem("Item" + QString::number(i), "");
+
+    QMetaObject::invokeMethod(canvas->rootObject(), "changeHeader");
+
+    header = findItem<QDeclarativeText>(contentItem, "header");
+    QVERIFY(!header);
+    header = findItem<QDeclarativeText>(contentItem, "header2");
+    QVERIFY(header);
+
+    QCOMPARE(header->y(), 0.0);
+    QCOMPARE(header->height(), 20.0);
+    QCOMPARE(gridview->contentY(), 0.0);
 }
 
 void tst_QDeclarativeGridView::indexAt()
diff --git a/tests/auto/declarative/qdeclarativelistview/data/footer.qml b/tests/auto/declarative/qdeclarativelistview/data/footer.qml
index 4cbd33b..33e04f1 100644
--- a/tests/auto/declarative/qdeclarativelistview/data/footer.qml
+++ b/tests/auto/declarative/qdeclarativelistview/data/footer.qml
@@ -1,6 +1,9 @@
 import QtQuick 1.0
 
 Rectangle {
+    function changeFooter() {
+        list.footer = footer2
+    }
     width: 240
     height: 320
     color: "#ffffff"
@@ -27,4 +30,9 @@ Rectangle {
         delegate: myDelegate
         footer: Text { objectName: "footer"; text: "Footer"; height: 30 }
     }
+
+    Component {
+        id: footer2
+        Text { objectName: "footer2"; text: "Footer 2"; height: 20 }
+    }
 }
diff --git a/tests/auto/declarative/qdeclarativelistview/data/header.qml b/tests/auto/declarative/qdeclarativelistview/data/header.qml
index 6da996e..38cdd6e 100644
--- a/tests/auto/declarative/qdeclarativelistview/data/header.qml
+++ b/tests/auto/declarative/qdeclarativelistview/data/header.qml
@@ -1,6 +1,9 @@
 import QtQuick 1.0
 
 Rectangle {
+    function changeHeader() {
+        list.header = header2
+    }
     width: 240
     height: 320
     color: "#ffffff"
@@ -26,6 +29,10 @@ Rectangle {
         snapMode: ListView.SnapToItem
         model: testModel
         delegate: myDelegate
-        header: Text { objectName: "header"; text: "Header"; height: 10 }
+        header: Text { objectName: "header"; text: "Header"; height: 20 }
+    }
+    Component {
+        id: header2
+        Text { objectName: "header2"; text: "Header 2"; height: 10 }
     }
 }
diff --git a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
index 4fff071..86b68ca 100644
--- a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
+++ b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
@@ -1736,12 +1736,27 @@ void tst_QDeclarativeListView::header()
         QDeclarativeText *header = findItem<QDeclarativeText>(contentItem, "header");
         QVERIFY(header);
         QCOMPARE(header->y(), 0.0);
+        QCOMPARE(header->height(), 20.0);
 
         QCOMPARE(listview->contentY(), 0.0);
 
         model.clear();
         QTRY_COMPARE(header->y(), 0.0);
 
+        for (int i = 0; i < 30; i++)
+            model.addItem("Item" + QString::number(i), "");
+
+        QMetaObject::invokeMethod(canvas->rootObject(), "changeHeader");
+
+        header = findItem<QDeclarativeText>(contentItem, "header");
+        QVERIFY(!header);
+        header = findItem<QDeclarativeText>(contentItem, "header2");
+        QVERIFY(header);
+
+        QCOMPARE(header->y(), 0.0);
+        QCOMPARE(header->height(), 10.0);
+        QCOMPARE(listview->contentY(), 0.0);
+
         delete canvas;
     }
     {
@@ -1796,6 +1811,7 @@ void tst_QDeclarativeListView::footer()
     QDeclarativeText *footer = findItem<QDeclarativeText>(contentItem, "footer");
     QVERIFY(footer);
     QCOMPARE(footer->y(), 60.0);
+    QCOMPARE(footer->height(), 30.0);
 
     model.removeItem(1);
     QTRY_COMPARE(footer->y(), 40.0);
@@ -1803,6 +1819,20 @@ void tst_QDeclarativeListView::footer()
     model.clear();
     QTRY_COMPARE(footer->y(), 0.0);
 
+    for (int i = 0; i < 30; i++)
+        model.addItem("Item" + QString::number(i), "");
+
+    QMetaObject::invokeMethod(canvas->rootObject(), "changeFooter");
+
+    footer = findItem<QDeclarativeText>(contentItem, "footer");
+    QVERIFY(!footer);
+    footer = findItem<QDeclarativeText>(contentItem, "footer2");
+    QVERIFY(footer);
+
+    QCOMPARE(footer->y(), 0.0);
+    QCOMPARE(footer->height(), 20.0);
+    QCOMPARE(listview->contentY(), 0.0);
+
     delete canvas;
 }