diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-05 15:31:54 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-06 13:16:17 +0000 |
| commit | 0cb85683406737dfb715218124c7b2d1936f855b (patch) | |
| tree | 1bc596dc300164ca5c6001555696f786fcbd821d /src/imports/controls/material/MenuItem.qml | |
| parent | 54efc8f33d9c37e8912f5755af588817192a869d (diff) | |
MenuItem: migrate from label to contentItem
Change-Id: I975c7a3bf3b44cf97a205c7e0a3256bee0376dfc
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/material/MenuItem.qml')
| -rw-r--r-- | src/imports/controls/material/MenuItem.qml | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/imports/controls/material/MenuItem.qml b/src/imports/controls/material/MenuItem.qml index 15ef6065..c09e9912 100644 --- a/src/imports/controls/material/MenuItem.qml +++ b/src/imports/controls/material/MenuItem.qml @@ -43,13 +43,11 @@ T.MenuItem { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, - (label ? label.implicitWidth : 0) + - (indicator ? indicator.implicitWidth : 0) + - (label && indicator ? spacing : 0) + leftPadding + rightPadding) + contentItem.implicitWidth + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, - Math.max(label ? label.implicitHeight : 0, + Math.max(contentItem.implicitHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) - baselineOffset: label ? label.y + label.baselineOffset : 0 + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 16 spacing: 16 @@ -129,12 +127,10 @@ T.MenuItem { } //! [indicator] - //! [label] - label: Text { - x: control.mirrored || !control.checkable ? control.leftPadding : (indicator.x + indicator.width + control.spacing) - y: control.topPadding - width: control.availableWidth - (control.checkable ? indicator.width + control.spacing : 0) - height: control.availableHeight + //! [contentItem] + contentItem: Text { + leftPadding: control.checkable && !control.mirrored ? control.indicator.width + control.spacing : 0 + rightPadding: control.checkable && control.mirrored ? control.indicator.width + control.spacing : 0 text: control.text font: control.font @@ -144,7 +140,7 @@ T.MenuItem { horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter } - //! [label] + //! [contentItem] //! [background] background: Rectangle { |