diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-30 16:21:16 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-30 15:26:59 +0000 |
| commit | cb86fefb321a05eb50b905a696401542acf7d441 (patch) | |
| tree | 643ec3076d5cd4353f945714027c7008b82e9230 | |
| parent | e7b526e08447bdea0b7c33f6d9e7bc3734f4796c (diff) | |
Allow ComboBox popup to use more screen space
Change-Id: Icd2ee375d7886c1d4d61577fc9e196cfa5d910d1
Task-number: QTBUG-50758
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| -rw-r--r-- | src/imports/controls/ComboBox.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/material/ComboBox.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/universal/ComboBox.qml | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml index e0e8d76f..189eed92 100644 --- a/src/imports/controls/ComboBox.qml +++ b/src/imports/controls/ComboBox.qml @@ -100,7 +100,9 @@ T.ComboBox { popup: T.Popup { y: control.height - 1 implicitWidth: control.width - implicitHeight: Math.min(200, listview.contentHeight) + implicitHeight: Math.min(396, listview.contentHeight) + topMargin: 6 + bottomMargin: 6 contentItem: ListView { id: listview diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml index 1aecaa3f..351feead 100644 --- a/src/imports/controls/material/ComboBox.qml +++ b/src/imports/controls/material/ComboBox.qml @@ -108,8 +108,10 @@ T.ComboBox { popup: T.Popup { y: control.height implicitWidth: control.width - implicitHeight: Math.min(200, listview.contentHeight) + implicitHeight: Math.min(396, listview.contentHeight) transformOrigin: Item.Top + topMargin: 12 + bottomMargin: 12 enter: Transition { // grow_fade_in diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml index e450685f..5c0f1004 100644 --- a/src/imports/controls/universal/ComboBox.qml +++ b/src/imports/controls/universal/ComboBox.qml @@ -110,7 +110,9 @@ T.ComboBox { //! [popup] popup: T.Popup { implicitWidth: control.width - implicitHeight: Math.min(200, listview.contentHeight) // TODO: 396 + implicitHeight: Math.min(396, listview.contentHeight) + topMargin: 8 + bottomMargin: 8 contentItem: ListView { id: listview |