diff options
Diffstat (limited to 'src/imports/controls')
-rw-r--r-- | src/imports/controls/Menu.qml | 6 | ||||
-rw-r--r-- | src/imports/controls/material/Menu.qml | 6 | ||||
-rw-r--r-- | src/imports/controls/universal/Menu.qml | 6 |
3 files changed, 9 insertions, 9 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" } diff --git a/src/imports/controls/material/Menu.qml b/src/imports/controls/material/Menu.qml index 71b12645..5480a7ff 100644 --- a/src/imports/controls/material/Menu.qml +++ b/src/imports/controls/material/Menu.qml @@ -45,8 +45,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 topPadding: 8 bottomPadding: 8 @@ -83,7 +83,7 @@ T.Menu { //! [background] background: Rectangle { implicitWidth: 200 - implicitHeight: 200 + implicitHeight: 48 radius: 3 color: control.Material.dialogColor diff --git a/src/imports/controls/universal/Menu.qml b/src/imports/controls/universal/Menu.qml index ed1fecfa..beed1f54 100644 --- a/src/imports/controls/universal/Menu.qml +++ b/src/imports/controls/universal/Menu.qml @@ -44,8 +44,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 { @@ -64,7 +64,7 @@ T.Menu { //! [background] background: Rectangle { implicitWidth: 200 - implicitHeight: 200 + implicitHeight: 40 color: control.Universal.chromeMediumLowColor border.color: control.Universal.chromeHighColor border.width: 1 // FlyoutBorderThemeThickness |