Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-24 04:36:34 +01:00
Code Releases Activity

Mac: Re-enable system-wide menu menu bar

Browse Source
This commit is contained in:
David Rosca 2014-09-25 14:27:25 +02:00
parent 13b1614e11
commit e83d75f251
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib/app/browserwindow.cpp
View File

@ -349,15 +349,23 @@ void BrowserWindow::setupUi()
void BrowserWindow::setupMenu()
{
// TODO: Mac menu
#ifdef Q_OS_MAC
return;
#endif
static MainMenu* macMainMenu = 0;
if (!macMainMenu) {
macMainMenu = new MainMenu(this, 0);
macMainMenu->initMenuBar(new QMenuBar(0));
}
else {
macMainMenu->setWindow(this);
}
#else
setMenuBar(new MenuBar(this));
m_mainMenu = new MainMenu(this, this);
m_mainMenu->initMenuBar(menuBar());
m_mainMenu->initSuperMenu(m_superMenu);
#endif
// Setup other shortcuts
QShortcut* reloadBypassCacheAction = new QShortcut(QKeySequence(QSL("Ctrl+F5")), this);