diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-20 08:08:40 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-21 20:00:29 +0000 |
| commit | 09e0e044c379a78f539400e7a4a1bbb109148639 (patch) | |
| tree | 82e36a39a312b007f2a83402983a8fe6ec3d19e5 /src/imports/controls/qquickprogressstrip.cpp | |
| parent | 618f34889be51f531b6226e6362f40604967b486 (diff) | |
ProgressBar: use contentItem instead of indicator
Change-Id: I8bd21b32b6f3d333c119d77b629b46fe411c06eb
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/qquickprogressstrip.cpp')
| -rw-r--r-- | src/imports/controls/qquickprogressstrip.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/imports/controls/qquickprogressstrip.cpp b/src/imports/controls/qquickprogressstrip.cpp index 0fc72087..fc3596db 100644 --- a/src/imports/controls/qquickprogressstrip.cpp +++ b/src/imports/controls/qquickprogressstrip.cpp @@ -63,8 +63,6 @@ QQuickProgressStrip::QQuickProgressStrip(QQuickItem *parent) : m_indeterminate(false) { setFlag(QQuickItem::ItemHasContents); - setImplicitWidth(116); - setImplicitHeight(6); } QQuickProgressStrip::~QQuickProgressStrip() @@ -142,6 +140,7 @@ QSGNode *QQuickProgressStrip::updatePaintNode(QSGNode *oldNode, QQuickItem::Upda } Q_ASSERT(rootTransformNode->type() == QSGNode::TransformNodeType); + const qreal y = (height() - implicitHeight()) / 2; const QColor color(0x35, 0x36, 0x37); if (m_indeterminate) { if (rootTransformNode->childCount() != blocks) { @@ -167,7 +166,7 @@ QSGNode *QQuickProgressStrip::updatePaintNode(QSGNode *oldNode, QQuickItem::Upda m.translate(blockStartX(i), 0); transformNode->setMatrix(m); - rectNode->setRect(QRectF(QPointF(), QSizeF(blockWidth, height()))); + rectNode->setRect(QRectF(QPointF(0, y), QSizeF(blockWidth, implicitHeight()))); rectNode->update(); transformNode = static_cast<QSGTransformNode *>(transformNode->nextSibling()); @@ -185,7 +184,7 @@ QSGNode *QQuickProgressStrip::updatePaintNode(QSGNode *oldNode, QQuickItem::Upda rootTransformNode->appendChildNode(rectNode); } - rectNode->setRect(QRectF(QPointF(), QSizeF(m_progress * width(), height()))); + rectNode->setRect(QRectF(QPointF(0, y), QSizeF(m_progress * width(), implicitHeight()))); rectNode->update(); } |