diff options
author | Fabio Falsini <falsinsoft@gmail.com> | 2019-11-20 20:04:30 +0100 |
---|---|---|
committer | Fabio Falsini <falsinsoft@gmail.com> | 2020-01-06 15:17:45 +0100 |
commit | 9d9c5a786c1c3c5986461fc9d885ca7c5ef06b83 (patch) | |
tree | e4ee4b867945d46a5aba7b9e38533db61231b37e /tests/auto/particles | |
parent | 0c2eaad357e555ccaf4fecf42aef03576bbae133 (diff) |
Add QQuickItemParticle give() method body
The current version of QQuickItemParticle give() method was not
implemented and a simple TODO comment was present instead.
I added a working body and add also a reparent feature when an
added item is released.
Fixes: QTBUG-76827
Change-Id: Ib7d289cad2ff0cd166e766eb7f07e92437e7681b
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests/auto/particles')
-rw-r--r-- | tests/auto/particles/qquickitemparticle/data/takeGive.qml | 74 | ||||
-rw-r--r-- | tests/auto/particles/qquickitemparticle/tst_qquickitemparticle.cpp | 13 |
2 files changed, 87 insertions, 0 deletions
diff --git a/tests/auto/particles/qquickitemparticle/data/takeGive.qml b/tests/auto/particles/qquickitemparticle/data/takeGive.qml new file mode 100644 index 0000000000..e95ae738bd --- /dev/null +++ b/tests/auto/particles/qquickitemparticle/data/takeGive.qml @@ -0,0 +1,74 @@ +/**************************************************************************** +** +** Copyright (C) 2020 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Particles 2.0 + +Rectangle { + id: testTakeGive + color: "black" + width: 320 + height: 320 + + function takeItems() + { + for(var i = 0; i < imgList.count; i++) ip.take(imgList.itemAt(i)); + } + function giveItems() + { + for(var i = 0; i < imgList.count; i++) ip.give(imgList.itemAt(i)); + } + + Repeater { + id: imgList + model: 100 + delegate: Image { + ItemParticle.onAttached: sys.acc = sys.acc + 1 + ItemParticle.onDetached: sys.acc = sys.acc - 1; + source: "../../shared/star.png" + } + } + + ParticleSystem { + id: sys + objectName: "system" + anchors.fill: parent + property int acc: 0 + + ItemParticle { + id: ip + } + + Emitter{ + //0,0 position + size: 32 + emitRate: 1000 + lifeSpan: Emitter.InfiniteLife + } + } +} diff --git a/tests/auto/particles/qquickitemparticle/tst_qquickitemparticle.cpp b/tests/auto/particles/qquickitemparticle/tst_qquickitemparticle.cpp index d9791cdb33..0087c74a9c 100644 --- a/tests/auto/particles/qquickitemparticle/tst_qquickitemparticle.cpp +++ b/tests/auto/particles/qquickitemparticle/tst_qquickitemparticle.cpp @@ -45,6 +45,7 @@ private slots: void test_basic(); void test_deletion(); void test_noDeletion(); + void test_takeGive(); }; void tst_qquickitemparticle::initTestCase() @@ -107,6 +108,18 @@ void tst_qquickitemparticle::test_noDeletion() delete view; } +void tst_qquickitemparticle::test_takeGive() +{ + QQuickView* view = createView(testFileUrl("takeGive.qml"), 500); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); + QMetaObject::invokeMethod(view->rootObject(), "takeItems"); + ensureAnimTime(1000, system->m_animation); + QVERIFY(system->property("acc").toInt() == 100); + QMetaObject::invokeMethod(view->rootObject(), "giveItems"); + QTRY_VERIFY(system->property("acc").toInt() == 0); + delete view; +} + QTEST_MAIN(tst_qquickitemparticle); #include "tst_qquickitemparticle.moc" |