mirror of
https://github.com/wheremyfoodat/Panda3DS.git
synced 2025-04-07 22:55:40 +12:00
Qt UI: fix menu bar on MacOS
MacOS requires a 'global' menubar to be available (e.g. QtMenuBar(nullptr)).
This commit is contained in:
parent
8940d78ea4
commit
3490e0a7a3
1 changed files with 2 additions and 2 deletions
|
@ -31,8 +31,7 @@ MainWindow::MainWindow(QApplication* app, QWidget* parent) : QMainWindow(parent)
|
||||||
appRunning = true;
|
appRunning = true;
|
||||||
|
|
||||||
// Set our menu bar up
|
// Set our menu bar up
|
||||||
menuBar = new QMenuBar(this);
|
menuBar = new QMenuBar(nullptr);
|
||||||
setMenuBar(menuBar);
|
|
||||||
|
|
||||||
// Create menu bar menus
|
// Create menu bar menus
|
||||||
auto fileMenu = menuBar->addMenu(tr("File"));
|
auto fileMenu = menuBar->addMenu(tr("File"));
|
||||||
|
@ -77,6 +76,7 @@ MainWindow::MainWindow(QApplication* app, QWidget* parent) : QMainWindow(parent)
|
||||||
|
|
||||||
auto aboutAction = aboutMenu->addAction(tr("About Panda3DS"));
|
auto aboutAction = aboutMenu->addAction(tr("About Panda3DS"));
|
||||||
connect(aboutAction, &QAction::triggered, this, &MainWindow::showAboutMenu);
|
connect(aboutAction, &QAction::triggered, this, &MainWindow::showAboutMenu);
|
||||||
|
setMenuBar(menuBar);
|
||||||
|
|
||||||
emu->setOutputSize(screen->surfaceWidth, screen->surfaceHeight);
|
emu->setOutputSize(screen->surfaceWidth, screen->surfaceHeight);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue