diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-04-12 14:33:28 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-18 15:57:43 +0000 |
| commit | 1641266caf6d689040aa66718a0b012b3124dbd4 (patch) | |
| tree | 71967a265ab9e4fac46accc51edd8f4eec5ee594 /src/imports/controls/universal/RoundButton.qml | |
| parent | 9fc3659a678e6d1bd6b2514486bde1d1725963da (diff) | |
RoundButton: add support for icons
Task-number: QTBUG-49820
Change-Id: I3509ed64434ccb669362a17a301d2ea53138ee9b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/universal/RoundButton.qml')
| -rw-r--r-- | src/imports/controls/universal/RoundButton.qml | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/imports/controls/universal/RoundButton.qml b/src/imports/controls/universal/RoundButton.qml index 626f1af0..759f5113 100644 --- a/src/imports/controls/universal/RoundButton.qml +++ b/src/imports/controls/universal/RoundButton.qml @@ -36,6 +36,8 @@ import QtQuick 2.9 import QtQuick.Templates 2.3 as T +import QtQuick.Controls 2.3 +import QtQuick.Controls.impl 2.3 import QtQuick.Controls.Universal 2.3 T.RoundButton { @@ -48,18 +50,23 @@ T.RoundButton { baselineOffset: contentItem.y + contentItem.baselineOffset padding: 8 + spacing: 8 + + icon.width: 20 + icon.height: 20 + icon.color: enabled ? undefined : Color.transparent(Universal.foreground, 0.2) property bool useSystemFocusVisuals: true - contentItem: Text { + contentItem: IconLabel { + spacing: control.spacing + mirrored: control.mirrored + display: control.display + + icon: control.icon text: control.text font: control.font - elide: Text.ElideRight - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - - opacity: enabled ? 1.0 : 0.2 - color: control.Universal.foreground + color: Color.transparent(control.Universal.foreground, enabled ? 1.0 : 0.2) } background: Rectangle { |