diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2017-02-27 11:15:46 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-12 11:15:54 +0000 |
| commit | 9976eec9ef53f5f987d778820cb9b64fe7cec290 (patch) | |
| tree | 36524dea626fbd8940a71d387a7825dd11ce10ad /src/imports/controls/universal | |
| parent | 4a8ae68f1e8acc0eb358ba7814a677ea7c5ae4f2 (diff) | |
ItemDelegate: add support for icons
Task-number: QTBUG-49820
Change-Id: I8976267610ede3ed2b808f5e8cb7f39ce65b6511
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/imports/controls/universal')
| -rw-r--r-- | src/imports/controls/universal/ItemDelegate.qml | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/imports/controls/universal/ItemDelegate.qml b/src/imports/controls/universal/ItemDelegate.qml index 09db7867..9ebadd26 100644 --- a/src/imports/controls/universal/ItemDelegate.qml +++ b/src/imports/controls/universal/ItemDelegate.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.ItemDelegate { @@ -54,19 +56,20 @@ T.ItemDelegate { topPadding: padding - 1 bottomPadding: padding + 1 - contentItem: Text { - leftPadding: !control.mirrored ? (control.indicator ? control.indicator.width : 0) + control.spacing : 0 - rightPadding: control.mirrored ? (control.indicator ? control.indicator.width : 0) + control.spacing : 0 + icon.width: 20 + icon.height: 20 + icon.color: enabled ? undefined : Universal.transparentColor(Universal.foreground, 0.2) + contentItem: IconLabel { + 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 { |