diff options
Diffstat (limited to 'src/particles/qquickitemparticle_p.h')
| -rw-r--r-- | src/particles/qquickitemparticle_p.h | 54 |
1 files changed, 13 insertions, 41 deletions
diff --git a/src/particles/qquickitemparticle_p.h b/src/particles/qquickitemparticle_p.h index 4fe5f9c031..4f8d81a8df 100644 --- a/src/particles/qquickitemparticle_p.h +++ b/src/particles/qquickitemparticle_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtQuick module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef ITEMPARTICLE_H #define ITEMPARTICLE_H @@ -58,7 +22,7 @@ QT_BEGIN_NAMESPACE class QQuickItemParticleAttached; -class QQuickItemParticle : public QQuickParticlePainter +class Q_QUICKPARTICLES_EXPORT QQuickItemParticle : public QQuickParticlePainter { Q_OBJECT Q_PROPERTY(bool fade READ fade WRITE setFade NOTIFY fadeChanged) @@ -67,7 +31,7 @@ class QQuickItemParticle : public QQuickParticlePainter QML_ADDED_IN_VERSION(2, 0) QML_ATTACHED(QQuickItemParticleAttached) public: - explicit QQuickItemParticle(QQuickItem *parent = 0); + explicit QQuickItemParticle(QQuickItem *parent = nullptr); ~QQuickItemParticle(); bool fade() const { return m_fade; } @@ -107,6 +71,10 @@ protected: void initialize(int gIdx, int pIdx) override; void prepareNextFrame(); private: + bool clockShouldUpdate() const; + void updateClock(); + void reconnectSystem(QQuickParticleSystem *system); + void reconnectParent(QQuickItem *parent); void processDeletables(); void tick(int time = 0); QSet<QQuickItem* > m_deletables; @@ -121,12 +89,16 @@ private: typedef QTickAnimationProxy<QQuickItemParticle, &QQuickItemParticle::tick> Clock; Clock *clock; + QMetaObject::Connection m_systemRunStateConnection; + QMetaObject::Connection m_systemPauseStateConnection; + QMetaObject::Connection m_systemEnabledStateConnection; + QMetaObject::Connection m_parentEnabledStateConnection; }; class QQuickItemParticleAttached : public QObject { Q_OBJECT - Q_PROPERTY(QQuickItemParticle* particle READ particle CONSTANT); + Q_PROPERTY(QQuickItemParticle* particle READ particle CONSTANT FINAL); public: QQuickItemParticleAttached(QObject* parent) : QObject(parent), m_mp(0), m_parentItem(nullptr) |