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/material/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/material/RadioDelegate.qml')
| -rw-r--r-- | src/imports/controls/material/RadioDelegate.qml | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/imports/controls/material/RadioDelegate.qml b/src/imports/controls/material/RadioDelegate.qml index 860e207e..18a2de35 100644 --- a/src/imports/controls/material/RadioDelegate.qml +++ b/src/imports/controls/material/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.Material 2.3 import QtQuick.Controls.Material.impl 2.3 @@ -54,23 +56,29 @@ T.RadioDelegate { bottomPadding: 8 spacing: 16 + icon.width: 24 + icon.height: 24 + icon.color: enabled ? undefined : Material.hintTextColor + indicator: RadioIndicator { x: text ? (control.mirrored ? control.leftPadding : control.width - width - control.rightPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 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 color: control.enabled ? control.Material.foreground : control.Material.hintTextColor - elide: Text.ElideRight - visible: control.text - horizontalAlignment: Text.AlignLeft - verticalAlignment: Text.AlignVCenter } background: Rectangle { |