From 55dc72f8cf47c6b32c1f172f4dffcd5a3bc743e6 Mon Sep 17 00:00:00 2001
From: Jan Arve Saether <jan-arve.saether@theqtcompany.com>
Date: Wed, 22 Apr 2015 10:49:45 +0200
Subject: Make Repeater emit items with right stacking order

When listening for Component.onCompleted on the items emitted by the
Repeater, the items' stacking order was not properly set up.
The stacking order was corrected after Component.onCompleted was emitted,
which was undesirable in some cases.

Task-number: QTBUG-45423
Change-Id: Ib96b3de81db556b09fb5fc8bd27ce19223014f7e
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
---
 src/quick/items/qquickrepeater.cpp                 | 20 ++++++------
 .../quick/qquickrepeater/data/stackingorder.qml    | 38 ++++++++++++++++++++++
 .../quick/qquickrepeater/tst_qquickrepeater.cpp    | 19 +++++++++++
 3 files changed, 67 insertions(+), 10 deletions(-)
 create mode 100644 tests/auto/quick/qquickrepeater/data/stackingorder.qml

diff --git a/src/quick/items/qquickrepeater.cpp b/src/quick/items/qquickrepeater.cpp
index 9cddd9de0d..5333ad2f08 100644
--- a/src/quick/items/qquickrepeater.cpp
+++ b/src/quick/items/qquickrepeater.cpp
@@ -398,9 +398,17 @@ void QQuickRepeaterPrivate::requestItems()
 void QQuickRepeater::createdItem(int index, QObject *)
 {
     Q_D(QQuickRepeater);
+    QObject *object = d->model->object(index, false);
+    QQuickItem *item = qmlobject_cast<QQuickItem*>(object);
+    emit itemAdded(index, item);
+}
+
+void QQuickRepeater::initItem(int index, QObject *object)
+{
+    Q_D(QQuickRepeater);
+    QQuickItem *item = qmlobject_cast<QQuickItem*>(object);
+
     if (!d->deletables.at(index)) {
-        QObject *object = d->model->object(index, false);
-        QQuickItem *item = qmlobject_cast<QQuickItem*>(object);
         if (!item) {
             if (object) {
                 d->model->release(object);
@@ -426,17 +434,9 @@ void QQuickRepeater::createdItem(int index, QObject *)
             }
             item->stackBefore(after);
         }
-        emit itemAdded(index, item);
     }
 }
 
-void QQuickRepeater::initItem(int, QObject *object)
-{
-    QQuickItem *item = qmlobject_cast<QQuickItem*>(object);
-    if (item)
-        item->setParentItem(parentItem());
-}
-
 void QQuickRepeater::modelUpdated(const QQmlChangeSet &changeSet, bool reset)
 {
     Q_D(QQuickRepeater);
diff --git a/tests/auto/quick/qquickrepeater/data/stackingorder.qml b/tests/auto/quick/qquickrepeater/data/stackingorder.qml
new file mode 100644
index 0000000000..41dadca0df
--- /dev/null
+++ b/tests/auto/quick/qquickrepeater/data/stackingorder.qml
@@ -0,0 +1,38 @@
+import QtQuick 2.0
+
+Item {
+    id: root
+    property bool stackingOrderOk: true
+
+    function verifyStackingOrder() {
+        var len = children.length
+        for (var i = 0; i < len; ++i) {
+            var expectedName;
+            if (i === 0) {
+                expectedName = "first"
+            } else if (i === len - 2) {
+                expectedName = "repeater"
+            } else if (i === len - 1) {
+                expectedName = "last"
+            } else {
+                expectedName = "middle" + (i - 1)
+            }
+            if (children[i].objectName !== expectedName)
+                stackingOrderOk = false
+        }
+    }
+    Item {
+        objectName: "first"
+    }
+    Repeater {
+        objectName: "repeater"
+        model: 1
+        Item {
+            objectName: "middle" + index
+            Component.onCompleted: { verifyStackingOrder();}
+        }
+    }
+    Item {
+        objectName: "last"
+    }
+}
diff --git a/tests/auto/quick/qquickrepeater/tst_qquickrepeater.cpp b/tests/auto/quick/qquickrepeater/tst_qquickrepeater.cpp
index b2039bd323..71b1ffa0d6 100644
--- a/tests/auto/quick/qquickrepeater/tst_qquickrepeater.cpp
+++ b/tests/auto/quick/qquickrepeater/tst_qquickrepeater.cpp
@@ -76,6 +76,7 @@ private slots:
     void jsArrayChange();
     void clearRemovalOrder();
     void destroyCount();
+    void stackingOrder();
 };
 
 class TestObject : public QObject
@@ -894,6 +895,24 @@ void tst_QQuickRepeater::destroyCount()
     QCOMPARE(repeater->property("componentCount").toInt(), 4);
 }
 
+void tst_QQuickRepeater::stackingOrder()
+{
+    QQmlEngine engine;
+    QQmlComponent component(&engine, testFileUrl("stackingorder.qml"));
+
+    QQuickItem *rootObject = qobject_cast<QQuickItem*>(component.create());
+    QVERIFY(rootObject);
+
+    QQuickRepeater *repeater = findItem<QQuickRepeater>(rootObject, "repeater");
+    QVERIFY(repeater);
+    int count = 1;
+    do {
+        bool stackingOrderOk = rootObject->property("stackingOrderOk").toBool();
+        QVERIFY(stackingOrderOk);
+        repeater->setModel(QVariant(++count));
+    } while (count < 3);
+}
+
 QTEST_MAIN(tst_QQuickRepeater)
 
 #include "tst_qquickrepeater.moc"
-- 
cgit v1.2.3