Commit 655672e2 authored by Jens Bache-Wiig's avatar Jens Bache-Wiig
Browse files

Fix menubar on mac


This is not a complete solution but enough for at least
a useful demonstration :)

Change-Id: I86b944a6d894d5db63163850fbb092cc290bc8ea
Reviewed-by: default avatarJens Bache-Wiig <jens.bache-wiig@digia.com>
parent 793e00e2
6.2 5.10 5.11 5.12 5.12.1 5.12.10 5.12.11 5.12.12 5.12.2 5.12.3 5.12.4 5.12.5 5.12.6 5.12.7 5.12.8 5.12.9 5.13 5.13.0 5.13.1 5.13.2 5.14 5.14.0 5.14.1 5.14.2 5.15 5.15.0 5.15.1 5.15.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 5.9.8 dev old/5.1 old/5.2 wip/calendar wip/tizen v5.15.0-alpha1 v5.14.1 v5.14.0 v5.14.0-rc2 v5.14.0-rc1 v5.14.0-beta3 v5.14.0-beta2 v5.14.0-beta1 v5.14.0-alpha1 v5.13.2 v5.13.1 v5.13.0 v5.13.0-rc3 v5.13.0-rc2 v5.13.0-rc1 v5.13.0-beta4 v5.13.0-beta3 v5.13.0-beta2 v5.13.0-beta1 v5.13.0-alpha1 v5.12.7 v5.12.6 v5.12.5 v5.12.4 v5.12.3 v5.12.2 v5.12.1 v5.12.0 v5.12.0-rc2 v5.12.0-rc1 v5.12.0-beta4 v5.12.0-beta3 v5.12.0-beta2 v5.12.0-beta1 v5.12.0-alpha1 v5.11.3 v5.11.2 v5.11.1 v5.11.0 v5.11.0-rc2 v5.11.0-rc1 v5.11.0-beta4 v5.11.0-beta3 v5.11.0-beta2 v5.11.0-beta1 v5.11.0-alpha1 v5.10.1 v5.10.0 v5.10.0-rc3 v5.10.0-rc2 v5.10.0-rc1 v5.10.0-beta4 v5.10.0-beta3 v5.10.0-beta2 v5.10.0-beta1 v5.10.0-alpha1 v5.9.9 v5.9.8 v5.9.7 v5.9.6 v5.9.5 v5.9.4 v5.9.3 v5.9.2 v5.9.1 v5.9.0 v5.9.0-rc2 v5.9.0-rc1 v5.9.0-beta4 v5.9.0-beta3 v5.9.0-beta2 v5.9.0-beta1 v5.9.0-alpha1 v5.8.0 v5.8.0-rc1 v5.8.0-beta1 v5.8.0-alpha1 v5.7.1 v5.7.0 v5.7.0-rc1 v5.7.0-beta1 v5.7.0-alpha1 v5.6.3 v5.6.2 v5.6.1 v5.6.1-1 v5.6.0 v5.6.0-rc1 v5.6.0-beta1 v5.6.0-alpha1 v5.5.1 v5.5.0 v5.5.0-rc1 v5.5.0-beta1 v5.5.0-alpha1 v5.4.2 v5.4.1 v5.4.0 v5.4.0-rc1 v5.4.0-beta1 v5.4.0-alpha1 v5.3.2 v5.3.1 v5.3.0 v5.3.0-rc1 v5.3.0-beta1 v5.3.0-alpha1 v5.2.1 v5.2.0 v5.2.0-rc1 v5.2.0-beta1 v5.2.0-alpha1 v5.1.1 v5.1.0 v5.1.0-rc2 v5.1.0-rc1 v5.1.0-beta1 v5.1.0-alpha1
No related merge requests found
Showing with 9 additions and 8 deletions
...@@ -46,6 +46,7 @@ Window { ...@@ -46,6 +46,7 @@ Window {
width: 320 width: 320
height: 240 height: 240
property alias menuBar: menuBarArea.data
property alias toolBar: toolBarArea.data property alias toolBar: toolBarArea.data
property alias statusBar: statusBarArea.data property alias statusBar: statusBarArea.data
default property alias data: contentArea.data default property alias data: contentArea.data
...@@ -58,6 +59,13 @@ Window { ...@@ -58,6 +59,13 @@ Window {
color: syspal.button color: syspal.button
} }
Column {
id: menuBarArea
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
}
Column { Column {
id: toolBarArea id: toolBarArea
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
#include <QtWidgets/QMenuBar> #include <QtWidgets/QMenuBar>
QtMenuBar::QtMenuBar(QQuickItem *parent) QtMenuBar::QtMenuBar(QQuickItem *parent)
: QQuickItem(parent), _menuBar(0) /*, _menuBar(new QMenuBar)*/ : QQuickItem(parent), _menuBar(new QMenuBar)
{ {
connect(this, SIGNAL(parentChanged(QQuickItem *)), this, SLOT(updateParent(QQuickItem *))); connect(this, SIGNAL(parentChanged(QQuickItem *)), this, SLOT(updateParent(QQuickItem *)));
setFlag(QQuickItem::ItemHasContents, false); setFlag(QQuickItem::ItemHasContents, false);
...@@ -62,17 +62,10 @@ QQmlListProperty<QtMenu> QtMenuBar::menus() ...@@ -62,17 +62,10 @@ QQmlListProperty<QtMenu> QtMenuBar::menus()
void QtMenuBar::updateParent(QQuickItem *newParent) void QtMenuBar::updateParent(QQuickItem *newParent)
{ {
if (QWindowItem* window = qobject_cast<QWindowItem*>(parent()))
_menuBar = window->window()->menuBar();
//THIS IS WRONG... WE NEED TO DO THAT DIFFERENT!
_menuBar->clear(); _menuBar->clear();
foreach (QtMenu *menu, m_menus) { foreach (QtMenu *menu, m_menus) {
_menuBar->addMenu(menu->qmenu()); _menuBar->addMenu(menu->qmenu());
} }
//THIS IS WRONG... WE NEED TO DO THAT DIFFERENT!
} }
void QtMenuBar::append_menu(QQmlListProperty<QtMenu> *list, QtMenu *menu) void QtMenuBar::append_menu(QQmlListProperty<QtMenu> *list, QtMenu *menu)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment