aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/CheckDelegate.qml
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-04-12 14:00:41 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2017-04-19 09:39:47 +0000
commit9c3919f4748c8de1a91a44c39fc25e09e802f254 (patch)
tree6260f2f536c98a7bcb1e6f3c81d41476c40ed158 /src/imports/controls/CheckDelegate.qml
parent4203a69b5390da38373e98838482e83f4a6c09be (diff)
CheckDelegate: add support for icons
Task-number: QTBUG-49820 Change-Id: I8644767d8d739337af1fe0fd29f87fea300752fb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/CheckDelegate.qml')
-rw-r--r--src/imports/controls/CheckDelegate.qml16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/imports/controls/CheckDelegate.qml b/src/imports/controls/CheckDelegate.qml
index 7bacba93..095e1949 100644
--- a/src/imports/controls/CheckDelegate.qml
+++ b/src/imports/controls/CheckDelegate.qml
@@ -52,17 +52,23 @@ T.CheckDelegate {
padding: 12
spacing: 12
- contentItem: Text {
+ icon.width: 24
+ icon.height: 24
+ icon.color: enabled ? undefined : Default.textDisabledLightColor
+
+ contentItem: IconLabel {
leftPadding: control.mirrored ? control.indicator.width + control.spacing : 0
rightPadding: !control.mirrored ? control.indicator.width + control.spacing : 0
+ 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 ? Default.textDarkColor : Default.textDisabledColor
- elide: Text.ElideRight
- visible: control.text
- horizontalAlignment: Text.AlignLeft
- verticalAlignment: Text.AlignVCenter
}
indicator: CheckIndicator {