diff options
| author | Nikita Krupenko <krnekit@gmail.com> | 2016-04-26 21:11:12 +0300 |
|---|---|---|
| committer | Nikita Krupenko <krnekit@gmail.com> | 2016-05-04 14:06:43 +0000 |
| commit | 4c0bbbb236a020a60f3f24332dd8f6116dd23b18 (patch) | |
| tree | be5265f85a8e1b158409c5c0b2b850d94a254834 /src/imports/controls/Menu.qml | |
| parent | 0fd9f5a549ea24abae1b3426aec16cea5ce81e57 (diff) | |
Allow Menu to grow bigger than implicitHeight of the background
Also, empty menu has now size of one MenuItem (+ paddings).
Change-Id: I5738d1312594941b5c57a02800665caa8a7cfba6
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/imports/controls/Menu.qml')
| -rw-r--r-- | src/imports/controls/Menu.qml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/controls/Menu.qml b/src/imports/controls/Menu.qml index 4eee635d..7513e83c 100644 --- a/src/imports/controls/Menu.qml +++ b/src/imports/controls/Menu.qml @@ -43,8 +43,8 @@ T.Menu { implicitWidth: Math.max(background ? background.implicitWidth : 0, contentItem ? contentItem.implicitWidth + leftPadding + rightPadding : 0) - implicitHeight: Math.min(background ? background.implicitHeight : 0, - contentItem ? contentItem.implicitHeight + topPadding + bottomPadding : 0) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem ? contentItem.implicitHeight : 0) + topPadding + bottomPadding //! [contentItem] contentItem: ListView { @@ -63,7 +63,7 @@ T.Menu { //! [background] background: Rectangle { implicitWidth: 200 - implicitHeight: 200 + implicitHeight: 40 color: "#ffffff" border.color: "#353637" } |