From 1f8ee02fbc06f822ee131fdd395c8e8cd244601d Mon Sep 17 00:00:00 2001 From: Gabriel de Dietrich Date: Wed, 5 Jun 2013 21:45:04 +0200 Subject: 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 --- src/controls/qquickmenupopupwindow_p.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/controls/qquickmenupopupwindow_p.h') diff --git a/src/controls/qquickmenupopupwindow_p.h b/src/controls/qquickmenupopupwindow_p.h index 4407fdec..4c629219 100644 --- a/src/controls/qquickmenupopupwindow_p.h +++ b/src/controls/qquickmenupopupwindow_p.h @@ -89,6 +89,7 @@ private: bool m_mouseMoved; bool m_needsActivatedEvent; + bool m_dismissed; QQuickItem *m_itemAt; QPointF m_oldItemPos; QQuickItem *m_parentItem; -- cgit v1.2.1