summaryrefslogtreecommitdiff
path: root/src/controls/qquickmenu_p.h
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/qquickmenu_p.h
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/qquickmenu_p.h')
-rw-r--r--src/controls/qquickmenu_p.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/controls/qquickmenu_p.h b/src/controls/qquickmenu_p.h
index f15e6caa..c1fab0b5 100644
--- a/src/controls/qquickmenu_p.h
+++ b/src/controls/qquickmenu_p.h
@@ -69,7 +69,7 @@ class QQuickMenu : public QQuickMenuText
Q_PROPERTY(int __selectedIndex READ selectedIndex WRITE setSelectedIndex NOTIFY __selectedIndexChanged)
Q_PROPERTY(bool __popupVisible READ popupVisible NOTIFY popupVisibleChanged)
Q_PROPERTY(QQuickItem *__contentItem READ menuContentItem WRITE setMenuContentItem NOTIFY menuContentItemChanged)
- Q_PROPERTY(int __minimumWidth READ minimumWidth WRITE setMinimumWidth)
+ Q_PROPERTY(int __minimumWidth READ minimumWidth WRITE setMinimumWidth NOTIFY minimumWidthChanged)
Q_PROPERTY(QFont __font READ font WRITE setFont)
Q_PROPERTY(qreal __xOffset READ xOffset WRITE setXOffset)
Q_PROPERTY(qreal __yOffset READ yOffset WRITE setYOffset)
@@ -100,6 +100,7 @@ Q_SIGNALS:
void __menuClosed();
void popupVisibleChanged();
void menuContentItemChanged();
+ void minimumWidthChanged();
public:
QQuickMenu(QObject *parent = 0);