diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-11-06 20:32:26 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-11-06 20:32:26 +0100 |
| commit | 501d45012f746d843e0144c78202297a577758bc (patch) | |
| tree | 5c2b125327d49e3495b5f47995d93fb4215acbb4 /src/imports/controls/MenuItem.qml | |
| parent | 9e1b044afa994cdd77fd256cea78cd144e804d76 (diff) | |
| parent | 442843db6f5dce6b594448d43b380c9b884a7c91 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/quickcontrols2/qquickchecklabel.cpp
src/quickcontrols2/qquickchecklabel_p.h
src/quickcontrols2/qquickmnemoniclabel_p.h
src/quicktemplates2/qquickbuttongroup_p.h
src/quicktemplates2/qquickspinbox.cpp
src/quicktemplates2/qquickswipedelegate.cpp
Change-Id: I1278b78dcaf25be5698f34751193b83dc951eb3c
Diffstat (limited to 'src/imports/controls/MenuItem.qml')
| -rw-r--r-- | src/imports/controls/MenuItem.qml | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/imports/controls/MenuItem.qml b/src/imports/controls/MenuItem.qml index 9737efb0..90a19f57 100644 --- a/src/imports/controls/MenuItem.qml +++ b/src/imports/controls/MenuItem.qml @@ -94,16 +94,13 @@ T.MenuItem { defaultColor: "#353637" } - background: Item { + background: Rectangle { implicitWidth: 200 implicitHeight: 40 - - Rectangle { - x: 1 - y: 1 - width: parent.width - 2 - height: parent.height - 2 - color: control.down ? control.palette.midlight : control.highlighted ? control.palette.light : "transparent" - } + x: 1 + y: 1 + width: control.width - 2 + height: control.height - 2 + color: control.down ? control.palette.midlight : control.highlighted ? control.palette.light : "transparent" } } |