diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-09-12 13:53:46 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2014-09-15 11:42:48 +0200 |
| commit | 238af2de1322007d0b74a9c9174e00024bf1cc1c (patch) | |
| tree | caaa2864a18603d47127312680c49207ead44013 /src/controls/qquickmenubar.cpp | |
| parent | 84d99bccfb7c627d83abe3c52a5a9d035f90c8d1 (diff) | |
| download | qtquickcontrols-238af2de1322007d0b74a9c9174e00024bf1cc1c.tar.gz | |
Let MenuBarStyle control whether a native menubar is used
Change-Id: I1daecf82421ffa330d050430d6e54e4cc0122913
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/controls/qquickmenubar.cpp')
| -rw-r--r-- | src/controls/qquickmenubar.cpp | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/controls/qquickmenubar.cpp b/src/controls/qquickmenubar.cpp index daf647dc..d3503f89 100644 --- a/src/controls/qquickmenubar.cpp +++ b/src/controls/qquickmenubar.cpp @@ -63,9 +63,8 @@ QT_BEGIN_NAMESPACE */ QQuickMenuBar::QQuickMenuBar(QObject *parent) - : QObject(parent), m_contentItem(0), m_parentWindow(0) + : QObject(parent), m_platformMenuBar(0), m_contentItem(0), m_parentWindow(0) { - m_platformMenuBar = QGuiApplicationPrivate::platformTheme()->createPlatformMenuBar(); } QQuickMenuBar::~QQuickMenuBar() @@ -77,11 +76,25 @@ QQmlListProperty<QQuickMenu> QQuickMenuBar::menus() return QQmlListProperty<QQuickMenu>(this, 0, &QQuickMenuBar::append_menu, &QQuickMenuBar::count_menu, &QQuickMenuBar::at_menu, 0); } -bool QQuickMenuBar::isNative() +bool QQuickMenuBar::isNative() const { return m_platformMenuBar != 0; } +void QQuickMenuBar::setNative(bool native) +{ + bool wasNative = isNative(); + if (native) { + if (!m_platformMenuBar) + m_platformMenuBar = QGuiApplicationPrivate::platformTheme()->createPlatformMenuBar(); + } else { + delete m_platformMenuBar; + m_platformMenuBar = 0; + } + if (isNative() != wasNative) + emit nativeChanged(); +} + void QQuickMenuBar::setContentItem(QQuickItem *item) { if (item != m_contentItem) { |