From 589d52b3b64a4b5221738a28df08be2eae4d12b2 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@qt.io>
Date: Thu, 11 Jan 2018 13:29:23 +0100
Subject: Fusion: eliminate internal IDs to enable deferred execution

Task-number: QTBUG-65341
Change-Id: I3bfd36f1d1e275eb507184c376599aa7751a069e
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 src/imports/controls/fusion/DelayButton.qml | 58 ++++++++++-------------------
 1 file changed, 19 insertions(+), 39 deletions(-)

(limited to 'src/imports/controls/fusion/DelayButton.qml')

diff --git a/src/imports/controls/fusion/DelayButton.qml b/src/imports/controls/fusion/DelayButton.qml
index abeda360..c39cb9d0 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
         }
     }
 
-- 
cgit v1.2.3