summaryrefslogtreecommitdiff
path: root/src/controls/Private/private.pri
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dedietrich@digia.com>2013-06-05 21:45:04 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-19 16:35:08 +0200
commit1f8ee02fbc06f822ee131fdd395c8e8cd244601d (patch)
tree8846593196d96701741a5a5fba046d13e851ca43 /src/controls/Private/private.pri
parent7adeff65148a3967af7b2ec44764a2c275dcd3fe (diff)
downloadqtquickcontrols-1f8ee02fbc06f822ee131fdd395c8e8cd244601d.tar.gz
ComboBox: Make popup scrollable
We factor out part the menu item container logic from Menu into ColumnMenuContent, which takes care of scrolling and mouse hovering, and selection. This makes possible to extend the menu items layout. The pop-over and pull-down look is specified by the menu style component by overriding the ScrollView style. The popup's maximum height is also specified by the menu style. The gallery example can finally use a font families combo box. Task-number: QTBUG-31568 Change-Id: I34a7278f476471c0eb51ef51dde3dd83e13002fe Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src/controls/Private/private.pri')
-rw-r--r--src/controls/Private/private.pri2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/controls/Private/private.pri b/src/controls/Private/private.pri
index bd001c0a..58cc7f11 100644
--- a/src/controls/Private/private.pri
+++ b/src/controls/Private/private.pri
@@ -37,6 +37,8 @@ PRIVATE_QML_FILES += \
$$PWD/ScrollViewHelper.qml \
$$PWD/ScrollBar.qml \
$$PWD/FocusFrame.qml \
+ $$PWD/ColumnMenuContent.qml \
+ $$PWD/MenuContentScroller.qml \
$$PWD/qmldir
QML_FILES += $$PRIVATE_QML_FILES