diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-04-11 16:42:12 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-11 18:33:32 +0000 |
| commit | 53a101f35b76ccea0e8a6bd00055259811df41d1 (patch) | |
| tree | a757b336e9c63ec0d4e8a79c06341c7c33451806 /src/imports/controls/Button.qml | |
| parent | 4503d45b93721e516e949419f3b9c6b796a7c13e (diff) | |
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 <jpnurmi@qt.io>
Diffstat (limited to 'src/imports/controls/Button.qml')
| -rw-r--r-- | src/imports/controls/Button.qml | 22 |
1 files changed, 6 insertions, 16 deletions
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 { |