diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-26 14:24:04 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-28 09:29:30 +0000 |
commit | 147c215ec9174c394bcaa2c33760df735f4d1ebf (patch) | |
tree | 4234dc2fa594f1bb02384d6c2b1fddcb83e1d121 /src/imports/controls/material/qquickmaterialprogressstrip_p.h | |
parent | 39af88a8da473afe039201164a4c2a7980f7c2f9 (diff) |
Material ProgressBar: implement indeterminate animator
The indicator is now a single QQuickItem, and runs in the render
thread, so keeps animating even if the app is busy.
Before:
RESULT : tst_CreationTime::material():"ProgressBar":
0.30 msecs per iteration (total: 79, iterations: 256)
After:
RESULT : tst_CreationTime::material():"ProgressBar":
0.18 msecs per iteration (total: 93, iterations: 512)
Change-Id: I3ec0982da9a02751725692c72da10a01d2afbfdc
Task-number: QTBUG-50161
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/material/qquickmaterialprogressstrip_p.h')
-rw-r--r-- | src/imports/controls/material/qquickmaterialprogressstrip_p.h | 101 |
1 files changed, 101 insertions, 0 deletions
diff --git a/src/imports/controls/material/qquickmaterialprogressstrip_p.h b/src/imports/controls/material/qquickmaterialprogressstrip_p.h new file mode 100644 index 00000000..d0618af6 --- /dev/null +++ b/src/imports/controls/material/qquickmaterialprogressstrip_p.h @@ -0,0 +1,101 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** 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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://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.LGPLv3 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.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 later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QQUICKMATERIALPROGRESSSTRIP_P_H +#define QQUICKMATERIALPROGRESSSTRIP_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtQuick/qquickitem.h> +#include <QtQuick/private/qquickanimator_p.h> + +QT_BEGIN_NAMESPACE + +class QQuickMaterialProgressStrip : public QQuickItem +{ + Q_OBJECT + Q_PROPERTY(QColor color READ color WRITE setColor FINAL) + Q_PROPERTY(qreal progress READ progress WRITE setProgress FINAL) + Q_PROPERTY(bool indeterminate READ isIndeterminate WRITE setIndeterminate FINAL) + +public: + QQuickMaterialProgressStrip(QQuickItem *parent = Q_NULLPTR); + + QColor color() const; + void setColor(const QColor &color); + + qreal progress() const; + void setProgress(qreal progress); + + bool isIndeterminate() const; + void setIndeterminate(bool indeterminate); + +protected: + QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) Q_DECL_OVERRIDE; + +private: + QColor m_color; + qreal m_progress; + bool m_indeterminate; +}; + +class QQuickMaterialStripAnimator : public QQuickAnimator +{ + Q_OBJECT + +public: + QQuickMaterialStripAnimator(QObject *parent = Q_NULLPTR); + +protected: + QString propertyName() const Q_DECL_OVERRIDE; + QQuickAnimatorJob *createJob() const Q_DECL_OVERRIDE; +}; + +QT_END_NAMESPACE + +QML_DECLARE_TYPE(QQuickMaterialProgressStrip) +QML_DECLARE_TYPE(QQuickMaterialStripAnimator) + +#endif // QQUICKMATERIALPROGRESSSTRIP_P_H |