moonpower/P3DS-test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qt UI: fix menu bar on MacOS (#668)

Browse Source 
MacOS requires a 'global' menubar to be available (e.g. QtMenuBar(nullptr)).
This commit is contained in:
Thomas
2024-12-06 19:04:00 +01:00
committed by GitHub
parent 4606be05ec
commit 1d2429c3ea
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/panda_qt/main_window.cpp
View File

@@ -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);