From 53a101f35b76ccea0e8a6bd00055259811df41d1 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 11 Apr 2017 16:42:12 +0200 Subject: QQuickIconLabel: create icon and label items lazily Before: Average: 120.2 frames; using samples; MedianAll=120; StdDev=0.447214, CoV=0.00372058 After: Average: 129.8 frames; using samples; MedianAll=130; StdDev=0.447214, CoV=0.00344541 Task-number: QTBUG-59746 Change-Id: I44b521688cd60e7e287968828f9d4062cc642a0d Reviewed-by: J-P Nurmi --- src/imports/controls/Button.qml | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (limited to 'src/imports/controls/Button.qml') diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml index 8a98bbad..438265d1 100644 --- a/src/imports/controls/Button.qml +++ b/src/imports/controls/Button.qml @@ -62,22 +62,12 @@ T.Button { mirrored: control.mirrored display: control.display - icon: IconImage { - name: control.icon.name - source: control.icon.source - sourceSize.width: control.icon.width - sourceSize.height: control.icon.height - color: control.icon.color - } - label: Text { - text: control.text - font: control.font - opacity: enabled || control.highlighted || control.checked ? 1 : 0.3 - color: control.checked || control.highlighted ? - Default.textLightColor : - (control.visualFocus ? Default.focusColor : (control.down ? Default.textDarkColor : Default.textColor)) - elide: Text.ElideRight - } + icon: control.icon + text: control.text + font: control.font + color: Color.transparent(control.checked || control.highlighted ? Default.textLightColor : + control.visualFocus ? Default.focusColor : control.down ? Default.textDarkColor : Default.textColor, + enabled || control.highlighted || control.checked ? 1 : 0.3) } background: Rectangle { -- cgit v1.2.3