mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2024-12-26 18:14:22 +00:00
Code Issues Projects Releases Wiki Activity

NOISSUE hide main toolbar toggle action instead of working around it

Browse Source
This commit is contained in:
Petr Mrázek 2019-07-16 01:30:09 +02:00
parent 6fde775b90
commit 2eec1df1a0
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
application/MainWindow.cpp
View File

@ -828,6 +828,13 @@ MainWindow::~MainWindow()
{ {
} }
QMenu * MainWindow::createPopupMenu()
{
QMenu* filteredMenu = QMainWindow::createPopupMenu();
filteredMenu->removeAction( ui->mainToolBar->toggleViewAction() );
return filteredMenu;
}
void MainWindow::konamiTriggered() void MainWindow::konamiTriggered()
{ {
// ENV.enableFeature("NewModsPage"); // ENV.enableFeature("NewModsPage");
@ -1654,13 +1661,6 @@ void MainWindow::on_actionAbout_triggered()
dialog.exec(); dialog.exec();
} }
void MainWindow::on_mainToolBar_visibilityChanged(bool)
{
// Don't allow hiding the main toolbar.
// This is the only way I could find to prevent it... :/
ui->mainToolBar->setVisible(true);
}
void MainWindow::on_actionDeleteInstance_triggered() void MainWindow::on_actionDeleteInstance_triggered()
{ {
if (!m_selectedInstance) if (!m_selectedInstance)

5
application/MainWindow.h
View File

@ -60,6 +60,9 @@ public:
signals: signals:
void isClosing(); void isClosing();
protected:
QMenu * createPopupMenu() override;
private slots: private slots:
void onCatToggled(bool); void onCatToggled(bool);
@ -109,8 +112,6 @@ private slots:
void newsButtonClicked(); void newsButtonClicked();
void on_mainToolBar_visibilityChanged(bool);
void on_actionLaunchInstance_triggered(); void on_actionLaunchInstance_triggered();
void on_actionLaunchInstanceOffline_triggered(); void on_actionLaunchInstanceOffline_triggered();