diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2018-01-16 09:37:42 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2018-01-16 09:38:19 +0100 |
commit | 08e6333450bc28c61fa804101df3ae8bef4e9568 (patch) | |
tree | acb8973cbbd2319ab75e460e35a3278459d717df /src/imports/controls/fusion/DelayButton.qml | |
parent | ef5e426bed3b1362394c7cc0c97522bb20cacff0 (diff) | |
parent | 744d14b468eb4bdd4dabf72ef7acdca1bc07ea5d (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: Ibd1490e8d958361e55ac272dff75c9361239958b
Diffstat (limited to 'src/imports/controls/fusion/DelayButton.qml')
-rw-r--r-- | src/imports/controls/fusion/DelayButton.qml | 58 |
1 files changed, 19 insertions, 39 deletions
diff --git a/src/imports/controls/fusion/DelayButton.qml b/src/imports/controls/fusion/DelayButton.qml index 2c8006be..261db320 100644 --- a/src/imports/controls/fusion/DelayButton.qml +++ b/src/imports/controls/fusion/DelayButton.qml @@ -58,53 +58,33 @@ T.DelayButton { } } - contentItem: Item { - implicitWidth: label.implicitWidth - implicitHeight: label.implicitHeight - - Item { - x: -control.leftPadding + (control.mirrored ? 0 : control.progress * control.width) - width: control.width - height: parent.height - + contentItem: ItemGroup { + ClippedText { clip: control.progress > 0 + clipX: -control.leftPadding + (control.mirrored ? 0 : control.progress * control.width) + clipWidth: control.width visible: control.mirrored ? control.progress > 0 : control.progress < 1 - Text { - id: label - x: -parent.x - width: control.availableWidth - height: parent.height - - text: control.text - font: control.font - color: control.mirrored ? control.palette.brightText : control.palette.buttonText - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - elide: Text.ElideRight - } + text: control.text + font: control.font + color: control.mirrored ? control.palette.brightText : control.palette.buttonText + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + elide: Text.ElideRight } - Item { - x: -control.leftPadding - width: (control.mirrored ? 1.0 - control.progress : control.progress) * control.width - height: parent.height - + ClippedText { clip: control.progress > 0 + clipX: -control.leftPadding + clipWidth: (control.mirrored ? 1.0 - control.progress : control.progress) * control.width visible: control.mirrored ? control.progress < 1 : control.progress > 0 - Text { - x: -parent.x - width: control.availableWidth - height: parent.height - - text: control.text - font: control.font - color: control.mirrored ? control.palette.buttonText : control.palette.brightText - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - elide: Text.ElideRight - } + text: control.text + font: control.font + color: control.mirrored ? control.palette.buttonText : control.palette.brightText + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + elide: Text.ElideRight } } |