diff options
| author | Nikita Krupenko <krnekit@gmail.com> | 2016-02-20 18:09:12 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-21 06:08:37 +0000 |
| commit | f5dc26d0bcba854b2be503076bacb9508b897aa5 (patch) | |
| tree | 91899190a42a99105a6dfd08875dbdfed2511396 /src/imports | |
| parent | 20b60be518f05611fb11a98b57e73f6bb6c8b46e (diff) | |
Do not limit ComboBox menu to predefined value
This allows ComboBox menu to occupy more screen space and use the window
size as limit.
Task-number: QTBUG-50758
Change-Id: If430338f7baa291406f3ad0657d0cb267e17a3a2
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/controls/ComboBox.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/material/ComboBox.qml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml index 189eed92..2745a0d8 100644 --- a/src/imports/controls/ComboBox.qml +++ b/src/imports/controls/ComboBox.qml @@ -100,7 +100,7 @@ T.ComboBox { popup: T.Popup { y: control.height - 1 implicitWidth: control.width - implicitHeight: Math.min(396, listview.contentHeight) + implicitHeight: listview.contentHeight topMargin: 6 bottomMargin: 6 diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml index eb637ef2..7f47672e 100644 --- a/src/imports/controls/material/ComboBox.qml +++ b/src/imports/controls/material/ComboBox.qml @@ -108,7 +108,7 @@ T.ComboBox { popup: T.Popup { y: control.height implicitWidth: control.width - implicitHeight: Math.min(396, listview.contentHeight) + implicitHeight: listview.contentHeight transformOrigin: Item.Top topMargin: 12 bottomMargin: 12 |