diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2017-02-27 15:02:15 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-18 15:57:49 +0000 |
| commit | a59cfd98a7874e674c732c366c2b458e7fa16286 (patch) | |
| tree | be14c8713c03c4d5a100a5dc54bad7fb9203ec61 /src/imports/controls/material/MenuItem.qml | |
| parent | 1641266caf6d689040aa66718a0b012b3124dbd4 (diff) | |
MenuItem: add support for icons
Task-number: QTBUG-49820
Change-Id: I6b735a5c87ca8f3154722984d36a3a631dd19c38
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/material/MenuItem.qml')
| -rw-r--r-- | src/imports/controls/material/MenuItem.qml | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/imports/controls/material/MenuItem.qml b/src/imports/controls/material/MenuItem.qml index f4aaa84a..7c4e93fe 100644 --- a/src/imports/controls/material/MenuItem.qml +++ b/src/imports/controls/material/MenuItem.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,6 +56,10 @@ T.MenuItem { bottomPadding: 12 spacing: 16 + icon.width: 24 + icon.height: 24 + icon.color: enabled ? undefined : Material.hintTextColor + indicator: CheckIndicator { x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 @@ -61,17 +67,19 @@ T.MenuItem { control: control } - contentItem: Text { + contentItem: IconLabel { leftPadding: control.checkable && !control.mirrored ? control.indicator.width + control.spacing : 0 rightPadding: control.checkable && control.mirrored ? control.indicator.width + control.spacing : 0 + spacing: control.spacing + mirrored: control.mirrored + display: control.display + alignment: 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 { |