diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2017-03-20 11:15:46 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-03-24 06:34:20 +0000 |
| commit | a7d9818dd414565cdcc4f4c9415f67735d146c68 (patch) | |
| tree | c2629d10b60f1fc7b6466d7217156f774397a44f /src/imports/controls/Button.qml | |
| parent | b0d2e6d13358cc30f044504f83bd584606b6c235 (diff) | |
Button: add support for icons
Task-number: QTBUG-49820
Change-Id: I7f2a72a4ef199d31b2b0041fdad42cfeb15f7b54
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/imports/controls/Button.qml')
| -rw-r--r-- | src/imports/controls/Button.qml | 38 |
1 files changed, 28 insertions, 10 deletions
diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml index ce8bfd7b..bdf09f32 100644 --- a/src/imports/controls/Button.qml +++ b/src/imports/controls/Button.qml @@ -51,17 +51,35 @@ T.Button { padding: 6 leftPadding: padding + 2 rightPadding: padding + 2 + spacing: 6 - contentItem: 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)) - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - elide: Text.ElideRight + icon.width: 24 + icon.height: 24 + icon.color: enabled ? undefined : Default.textDisabledLightColor + + contentItem: DisplayLayout { + spacing: control.spacing + mirrored: control.mirrored + + icon: IconImage { + id: iconImage + name: control.icon.name + source: control.icon.source + sourceSize.width: control.icon.width + sourceSize.height: control.icon.height + color: control.icon.color + } + text: 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)) + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + elide: Text.ElideRight + } } background: Rectangle { |