diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-04-13 13:57:28 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-04-16 08:17:16 +0000 |
| commit | d2496a68bbed9ed7e66faefef1e03e5352cc4100 (patch) | |
| tree | 15bb6a044f6b035a6f54f33518abb7eda9996072 /src/imports/controls/Menu.qml | |
| parent | 28ab81f2c02378735ff82a6e130f0d38d6471069 (diff) | |
Popup: add implicitBackground|ContentWidth|Height properties
[ChangeLog][Controls][Popup] Added implicitBackgroundWidth,
implicitBackgroundHeight, implicitContentWidth, and implicitContentHeight
properties.
Change-Id: I3881b337bbd46b29873e8c00832006eec8b2836a
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/Menu.qml')
| -rw-r--r-- | src/imports/controls/Menu.qml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/controls/Menu.qml b/src/imports/controls/Menu.qml index 770db8eb..8e71698a 100644 --- a/src/imports/controls/Menu.qml +++ b/src/imports/controls/Menu.qml @@ -42,10 +42,10 @@ import QtQuick.Templates 2.5 as T T.Menu { id: control - implicitWidth: Math.max(background ? background.implicitWidth : 0, - contentItem ? contentItem.implicitWidth + leftPadding + rightPadding : 0) - implicitHeight: Math.max(background ? background.implicitHeight : 0, - contentItem ? contentItem.implicitHeight : 0) + topPadding + bottomPadding + implicitWidth: Math.max(implicitBackgroundWidth, + contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight, + contentHeight + topPadding + bottomPadding) margins: 0 overlap: 1 |