diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-22 16:15:20 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-22 16:15:20 +0100 |
| commit | 9cb31e4c7129771de1f7139c3accf10752467a67 (patch) | |
| tree | e361463b58230e4232193bacd7301fdf90dc5499 /src/imports/controls/universal | |
| parent | 726da89e771ab46646297e9f6494625cfc680215 (diff) | |
| parent | 4c66fbe8892e644b3d3c62d5bd94f03831ff76de (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/templates/qquickpopup.cpp
Change-Id: Idb43ff6aff692d01e9bc03450a474bf18a7e41fa
Diffstat (limited to 'src/imports/controls/universal')
| -rw-r--r-- | src/imports/controls/universal/Popup.qml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/imports/controls/universal/Popup.qml b/src/imports/controls/universal/Popup.qml index d26dd02d..7ab79545 100644 --- a/src/imports/controls/universal/Popup.qml +++ b/src/imports/controls/universal/Popup.qml @@ -41,8 +41,10 @@ import Qt.labs.controls.universal 1.0 T.Popup { id: control - implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentWidth > 0 ? contentWidth + leftPadding + rightPadding : 0) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentWidth > 0 ? contentHeight + topPadding + bottomPadding : 0) contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) |