aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/universal/ComboBox.qml
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports/controls/universal/ComboBox.qml')
-rw-r--r--src/imports/controls/universal/ComboBox.qml3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml
index 35c4d815..1888f8d4 100644
--- a/src/imports/controls/universal/ComboBox.qml
+++ b/src/imports/controls/universal/ComboBox.qml
@@ -35,6 +35,7 @@
****************************************************************************/
import QtQuick 2.9
+import QtQuick.Window 2.3
import QtQuick.Controls 2.3
import QtQuick.Controls.impl 2.3
import QtQuick.Templates 2.3 as T
@@ -132,7 +133,7 @@ T.ComboBox {
popup: T.Popup {
width: control.width
- implicitHeight: Math.min(396, contentItem.implicitHeight)
+ height: Math.min(contentItem.implicitHeight, control.Window.height - topMargin - bottomMargin)
topMargin: 8
bottomMargin: 8