diff options
Diffstat (limited to 'src/imports/controls/universal/qquickuniversalprogressstrip.cpp')
-rw-r--r-- | src/imports/controls/universal/qquickuniversalprogressstrip.cpp | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/imports/controls/universal/qquickuniversalprogressstrip.cpp b/src/imports/controls/universal/qquickuniversalprogressstrip.cpp index 39ce1b5c..1ae5b371 100644 --- a/src/imports/controls/universal/qquickuniversalprogressstrip.cpp +++ b/src/imports/controls/universal/qquickuniversalprogressstrip.cpp @@ -62,11 +62,11 @@ class QQuickUniversalProgressStripAnimatorJob : public QQuickAnimatorJob public: QQuickUniversalProgressStripAnimatorJob(); - void initialize(QQuickAnimatorController *controller) Q_DECL_OVERRIDE; - void updateCurrentTime(int time) Q_DECL_OVERRIDE; - void writeBack() Q_DECL_OVERRIDE; - void nodeWasDestroyed() Q_DECL_OVERRIDE; - void afterNodeSync() Q_DECL_OVERRIDE; + void initialize(QQuickAnimatorController *controller) override; + void updateCurrentTime(int time) override; + void writeBack() override; + void nodeWasDestroyed() override; + void afterNodeSync() override; private: struct Phase { @@ -82,7 +82,7 @@ private: Phase m_ellipsePhases[PhaseCount]; }; -QQuickUniversalProgressStripAnimatorJob::QQuickUniversalProgressStripAnimatorJob() : m_node(Q_NULLPTR) +QQuickUniversalProgressStripAnimatorJob::QQuickUniversalProgressStripAnimatorJob() : m_node(nullptr) { m_borderPhases[0] = Phase( 500, -50, 0); m_borderPhases[1] = Phase(1500, 0, 0); @@ -148,7 +148,7 @@ void QQuickUniversalProgressStripAnimatorJob::updateCurrentTime(int time) if (visible) { { int phaseIndex, remain = time, elapsed = 0; - for (phaseIndex = 0; phaseIndex < PhaseCount; ++phaseIndex) { + for (phaseIndex = 0; phaseIndex < PhaseCount - 1; ++phaseIndex) { if (remain <= m_borderPhases[phaseIndex].duration + begin) break; remain -= m_borderPhases[phaseIndex].duration; @@ -171,7 +171,7 @@ void QQuickUniversalProgressStripAnimatorJob::updateCurrentTime(int time) curve.addCubicBezierSegment(QPointF(0.4, 0.0), QPointF(0.6, 1.0), QPointF(1.0, 1.0)); int phaseIndex, remain = time, elapsed = 0; - for (phaseIndex = 0; phaseIndex < PhaseCount; ++phaseIndex) { + for (phaseIndex = 0; phaseIndex < PhaseCount - 1; ++phaseIndex) { if (remain <= m_ellipsePhases[phaseIndex].duration + begin) break; remain -= m_ellipsePhases[phaseIndex].duration; @@ -203,7 +203,7 @@ void QQuickUniversalProgressStripAnimatorJob::writeBack() void QQuickUniversalProgressStripAnimatorJob::nodeWasDestroyed() { - m_node = Q_NULLPTR; + m_node = nullptr; } void QQuickUniversalProgressStripAnimatorJob::afterNodeSync() @@ -241,11 +241,12 @@ QColor QQuickUniversalProgressStrip::color() const void QQuickUniversalProgressStrip::setColor(const QColor &color) { - if (m_color != color) { - m_color = color; - update(); - emit colorChanged(); - } + if (m_color == color) + return; + + m_color = color; + update(); + emit colorChanged(); } QSGNode *QQuickUniversalProgressStrip::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) |