aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2016-01-23 14:21:44 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2016-01-23 13:37:35 +0000
commit63a858dfdea91d51cdba974766ccc2e4264a8280 (patch)
tree897b87cd51d123d9351de24e2fb24e8e68837cda /src/imports
parentb0b3b7229d4f7d521840cb09c2d4c63f1c29726b (diff)
ComboBox: set implicit size for the popup
Change-Id: I6642a740c93c24cc86b4c7377def252390ca9f71 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/controls/ComboBox.qml4
-rw-r--r--src/imports/controls/material/ComboBox.qml4
-rw-r--r--src/imports/controls/universal/ComboBox.qml4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml
index 0f8001e2..5941bcf4 100644
--- a/src/imports/controls/ComboBox.qml
+++ b/src/imports/controls/ComboBox.qml
@@ -99,8 +99,8 @@ T.ComboBox {
//! [popup]
popup: T.Popup {
y: control.height - 1
- width: control.width
- height: Math.min(200, listview.contentHeight)
+ implicitWidth: control.width
+ implicitHeight: Math.min(200, listview.contentHeight)
contentItem: ListView {
id: listview
diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml
index c3a7d74f..b19901fb 100644
--- a/src/imports/controls/material/ComboBox.qml
+++ b/src/imports/controls/material/ComboBox.qml
@@ -115,8 +115,8 @@ T.ComboBox {
//! [popup]
popup: T.Popup {
y: control.height
- width: control.width
- height: Math.min(200, listview.contentHeight)
+ implicitWidth: control.width
+ implicitHeight: Math.min(200, listview.contentHeight)
enter: Transition {
// grow_fade_in
diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml
index 79973dde..d4e687d0 100644
--- a/src/imports/controls/universal/ComboBox.qml
+++ b/src/imports/controls/universal/ComboBox.qml
@@ -109,8 +109,8 @@ T.ComboBox {
//! [popup]
popup: T.Popup {
- width: control.width
- height: Math.min(200, listview.contentHeight) // TODO: 396
+ implicitWidth: control.width
+ implicitHeight: Math.min(200, listview.contentHeight) // TODO: 396
contentItem: ListView {
id: listview