0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix typos causing build failures on non-macOS systems

Browse Source 
It also did the exact opposite thing I was trying to do, so that's fixed too...
This commit is contained in:
Kenneth Chew 2022-04-08 17:00:42 -04:00
parent ab82358dcb
commit 9f3eed6ca2
No known key found for this signature in database
GPG Key ID: F17D3E14A07739DA
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
launcher/ui/MainWindow.cpp
View File

@ -1099,11 +1099,13 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new MainWindow
// macOS always has a native menu bar, so these fixes are not applicable // macOS always has a native menu bar, so these fixes are not applicable
// Other systems may or may not have a native menu bar (most do not - it seems like only Ubuntu Unity does) // Other systems may or may not have a native menu bar (most do not - it seems like only Ubuntu Unity does)
#ifdef Q_OS_MAC #ifndef Q_OS_MAC
void MainWindow::keyReleaseEvent(QKeyEvent *event) void MainWindow::keyReleaseEvent(QKeyEvent *event)
{ {
if(event->key()==Qt::Key_Alt) if(event->key()==Qt::Key_Alt)
ui->menuBar->setVisible(!ui->menuBar->isVisible()); ui->menuBar->setVisible(!ui->menuBar->isVisible());
else
QMainWindow::keyReleaseEvent(event);
} }
// FIXME: This is a hack because keyboard shortcuts do nothing while menu bar is hidden on systems without native menu bar // FIXME: This is a hack because keyboard shortcuts do nothing while menu bar is hidden on systems without native menu bar
@ -1111,7 +1113,10 @@ void MainWindow::keyReleaseEvent(QKeyEvent *event)
void MainWindow::keyPressEvent(QKeyEvent *event) void MainWindow::keyPressEvent(QKeyEvent *event)
{ {
if(ui->menuBar->isVisible() || ui->menuBar->isNativeMenuBar()) if(ui->menuBar->isVisible() || ui->menuBar->isNativeMenuBar())
{
QMainWindow::keyPressEvent(event);
return; // let the menu bar handle the keyboard shortcuts return; // let the menu bar handle the keyboard shortcuts
}
if(event->modifiers().testFlag(Qt::ControlModifier)) if(event->modifiers().testFlag(Qt::ControlModifier))
{ {

2
launcher/ui/MainWindow.h
View File

@ -186,9 +186,11 @@ private slots:
void globalSettingsClosed(); void globalSettingsClosed();
#ifndef Q_OS_MAC
void keyReleaseEvent(QKeyEvent *event) override; void keyReleaseEvent(QKeyEvent *event) override;
void keyPressEvent(QKeyEvent *event) override; void keyPressEvent(QKeyEvent *event) override;
#endif
private: private:
void retranslateUi(); void retranslateUi();