diff options
| author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-12-03 15:02:21 +0100 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-12-03 14:40:42 +0000 |
| commit | 6f9c52781a6ae2c84cb8b6e849a18856aef60f80 (patch) | |
| tree | fc7b11cb4501117907df96cc355868dc56b7494c | |
| parent | 09e680cd5dcffda26efe9301881b91817a29f6b2 (diff) | |
Adapt MenuItem to designs
Decrease the padding and swap the label/indicator order.
Change-Id: I0ee2528d3c3111024fe1a6e52acc0da1a0d30990
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| -rw-r--r-- | src/imports/controls/MenuItem.qml | 7 | ||||
| -rw-r--r-- | tests/manual/testbench/main.qml | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/imports/controls/MenuItem.qml b/src/imports/controls/MenuItem.qml index df51fc72..9e290063 100644 --- a/src/imports/controls/MenuItem.qml +++ b/src/imports/controls/MenuItem.qml @@ -46,12 +46,11 @@ T.MenuItem { implicitHeight: background ? background.implicitHeight : (label ? label.implicitHeight : 0) + (indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding - padding: 12 - spacing: 12 + padding: 6 //! [label] label: Text { - x: control.mirrored ? control.width - width - control.rightPadding : control.leftPadding + x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding y: control.topPadding width: control.availableWidth - (control.checkable ? indicator.width + control.spacing : 0) height: control.availableHeight @@ -68,7 +67,7 @@ T.MenuItem { //! [indicator] indicator: Image { - x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding + x: control.mirrored ? control.width - width - control.rightPadding : control.leftPadding y: control.topPadding + (control.availableHeight - height) / 2 visible: control.checked diff --git a/tests/manual/testbench/main.qml b/tests/manual/testbench/main.qml index b375a098..679c8a1c 100644 --- a/tests/manual/testbench/main.qml +++ b/tests/manual/testbench/main.qml @@ -105,12 +105,15 @@ ApplicationWindow { MenuItem { text: "Option 1" + checkable: true } MenuItem { text: "Option 2" + checkable: true } MenuItem { text: "Option 3" + checkable: true } } |