diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-05-11 12:48:55 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-05-12 07:54:34 +0000 |
| commit | 08dc547c859d6446d4bb589b50e0feccbffc7c9f (patch) | |
| tree | e94235acea80d81d33cff1817ca6e7f4c8e73b25 /src/imports/controls/qquickdefaultprogressbar_p.h | |
| parent | 910f9d6930fdd739e9490fa491986d74b6a57975 (diff) | |
Default: pass busy indicator and progress bar colors from QML
Default.textColor (also used in eg. RangeSlider to fill the range)
is equal to the color that was previously hard-coded in
qquickdefaultbusyindicator.cpp and qquickdefaultprogressbar.cpp.
Change-Id: I8f0749862def31667b6ef2ab3b4c6ea71a590755
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/qquickdefaultprogressbar_p.h')
| -rw-r--r-- | src/imports/controls/qquickdefaultprogressbar_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/imports/controls/qquickdefaultprogressbar_p.h b/src/imports/controls/qquickdefaultprogressbar_p.h index a922c07f..dbdf5ad4 100644 --- a/src/imports/controls/qquickdefaultprogressbar_p.h +++ b/src/imports/controls/qquickdefaultprogressbar_p.h @@ -57,6 +57,7 @@ class QQuickDefaultProgressBar : public QQuickItem Q_OBJECT Q_PROPERTY(bool indeterminate READ isIndeterminate WRITE setIndeterminate FINAL) Q_PROPERTY(qreal progress READ progress WRITE setProgress FINAL) + Q_PROPERTY(QColor color READ color WRITE setColor FINAL) public: explicit QQuickDefaultProgressBar(QQuickItem *parent = nullptr); @@ -67,6 +68,9 @@ public: qreal progress() const; void setProgress(qreal progress); + QColor color() const; + void setColor(const QColor &color); + protected: void itemChange(ItemChange change, const ItemChangeData &data) override; QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override; @@ -74,6 +78,7 @@ protected: private: qreal m_progress; bool m_indeterminate; + QColor m_color; }; QT_END_NAMESPACE |