diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-04-12 14:06:35 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-19 09:39:50 +0000 |
| commit | ce0a6e5d78fa6edca573e5d48b5448647ba7642d (patch) | |
| tree | ec42e4d63e1c4c6a105f7087c0785fdbb972c73d /src/imports/controls/universal/RadioDelegate.qml | |
| parent | 9c3919f4748c8de1a91a44c39fc25e09e802f254 (diff) | |
RadioDelegate: add support for icons
Task-number: QTBUG-49820
Change-Id: Ia1ebd7b1f914ed34f8a17dde9cd2e7642e820fee
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/universal/RadioDelegate.qml')
| -rw-r--r-- | src/imports/controls/universal/RadioDelegate.qml | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/imports/controls/universal/RadioDelegate.qml b/src/imports/controls/universal/RadioDelegate.qml index b38e3a72..17373e08 100644 --- a/src/imports/controls/universal/RadioDelegate.qml +++ b/src/imports/controls/universal/RadioDelegate.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.RadioDelegate { @@ -54,6 +56,10 @@ T.RadioDelegate { topPadding: padding - 1 bottomPadding: padding + 1 + icon.width: 20 + icon.height: 20 + icon.color: enabled ? undefined : Color.transparent(Universal.foreground, 0.2) + property Item control indicator: RadioIndicator { @@ -62,19 +68,19 @@ T.RadioDelegate { control: control } - contentItem: Text { + contentItem: IconLabel { leftPadding: !control.mirrored ? 0 : control.indicator.width + control.spacing rightPadding: control.mirrored ? 0 : control.indicator.width + control.spacing + spacing: control.spacing + mirrored: control.mirrored + display: control.display + alignment: control.display === IconLabel.IconOnly || control.display === IconLabel.TextUnderIcon ? Qt.AlignCenter : Qt.AlignLeft + + icon: control.icon text: control.text font: control.font - elide: Text.ElideRight - visible: control.text - horizontalAlignment: Text.AlignLeft - 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 { |