diff options
author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-06-05 21:45:04 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 16:35:08 +0200 |
commit | 1f8ee02fbc06f822ee131fdd395c8e8cd244601d (patch) | |
tree | 8846593196d96701741a5a5fba046d13e851ca43 /src/controls/Private/ScrollBar.qml | |
parent | 7adeff65148a3967af7b2ec44764a2c275dcd3fe (diff) | |
download | qtquickcontrols-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/ScrollBar.qml')
-rw-r--r-- | src/controls/Private/ScrollBar.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/Private/ScrollBar.qml b/src/controls/Private/ScrollBar.qml index 9ee330d3..49dd20a4 100644 --- a/src/controls/Private/ScrollBar.qml +++ b/src/controls/Private/ScrollBar.qml @@ -56,6 +56,7 @@ Item { property alias minimumValue: slider.minimumValue property alias maximumValue: slider.maximumValue property alias value: slider.value + property int singleStep: 20 activeFocusOnTab: false @@ -89,7 +90,6 @@ Item { id: internal property bool horizontal: orientation === Qt.Horizontal property int pageStep: internal.horizontal ? width : height - property int singleStep: 20 property bool scrollToClickposition: internal.scrollToClickPosition anchors.fill: parent cursorShape: __panel.visible ? Qt.ArrowCursor : Qt.IBeamCursor // forces a cursor change |