diff options
| -rw-r--r-- | src/imports/controls/Menu.qml | 8 | ||||
| -rw-r--r-- | src/imports/controls/material/Menu.qml | 8 | ||||
| -rw-r--r-- | src/imports/controls/universal/Menu.qml | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/imports/controls/Menu.qml b/src/imports/controls/Menu.qml index 482b68a3..6692ef08 100644 --- a/src/imports/controls/Menu.qml +++ b/src/imports/controls/Menu.qml @@ -41,10 +41,10 @@ import Qt.labs.templates 1.0 as T T.Menu { id: control - width: Math.max(background ? background.implicitWidth : 0, - contentItem ? contentItem.implicitWidth + leftPadding + rightPadding : 0) - height: Math.min(background ? background.implicitHeight : 0, - contentItem ? contentItem.implicitHeight + topPadding + bottomPadding : 0) + 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) //! [contentItem] contentItem: ListView { diff --git a/src/imports/controls/material/Menu.qml b/src/imports/controls/material/Menu.qml index 86ab5c81..6a5c6f61 100644 --- a/src/imports/controls/material/Menu.qml +++ b/src/imports/controls/material/Menu.qml @@ -43,10 +43,10 @@ import QtGraphicalEffects 1.0 T.Menu { id: control - width: Math.max(background ? background.implicitWidth : 0, - contentItem ? contentItem.implicitWidth + leftPadding + rightPadding : 0) - height: Math.min(background ? background.implicitHeight : 0, - contentItem ? contentItem.implicitHeight + topPadding + bottomPadding : 0) + 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) enter: Transition { // grow_fade_in diff --git a/src/imports/controls/universal/Menu.qml b/src/imports/controls/universal/Menu.qml index 765ca030..7cae65f1 100644 --- a/src/imports/controls/universal/Menu.qml +++ b/src/imports/controls/universal/Menu.qml @@ -42,10 +42,10 @@ import Qt.labs.controls.universal 1.0 T.Menu { id: control - width: Math.max(background ? background.implicitWidth : 0, - contentItem ? contentItem.implicitWidth + leftPadding + rightPadding : 0) - height: Math.min(background ? background.implicitHeight : 0, - contentItem ? contentItem.implicitHeight + topPadding + bottomPadding : 0) + 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) //! [contentItem] contentItem: ListView { |