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/ProgressBar.qml | |
| 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/ProgressBar.qml')
| -rw-r--r-- | src/imports/controls/ProgressBar.qml | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/imports/controls/ProgressBar.qml b/src/imports/controls/ProgressBar.qml index 795fd231..0439cbb9 100644 --- a/src/imports/controls/ProgressBar.qml +++ b/src/imports/controls/ProgressBar.qml @@ -42,17 +42,15 @@ T.ProgressBar { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, - indicator ? indicator.implicitWidth : 0) + leftPadding + rightPadding + contentItem.implicitWidth + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, - indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding + contentItem.implicitHeight + topPadding + bottomPadding) - //! [indicator] - indicator: ProgressStrip { + //! [contentItem] + contentItem: ProgressStrip { id: strip - x: control.leftPadding - y: control.topPadding + (control.availableHeight - height) / 2 - width: control.availableWidth - height: 6 + implicitHeight: 6 + implicitWidth: 116 scale: control.mirrored ? -1 : 1 progress: control.position indeterminate: control.indeterminate @@ -62,7 +60,7 @@ T.ProgressBar { running: control.visible && control.indeterminate } } - //! [indicator] + //! [contentItem] //! [background] background: Rectangle { |