Don't change window maximized state when clicking a notification
This commit is contained in:
parent
2a83f6dd4b
commit
4ee12f0b69
4 changed files with 8 additions and 6 deletions
|
@ -437,7 +437,7 @@ TabMessage *TabSupervisor::addMessageTab(const QString &receiverName, bool focus
|
|||
}
|
||||
|
||||
void TabSupervisor::maximizeMainWindow() {
|
||||
emit maximize();
|
||||
emit showWindowIfHidden();
|
||||
}
|
||||
|
||||
void TabSupervisor::talkLeft(TabMessage *tab)
|
||||
|
|
|
@ -81,7 +81,7 @@ signals:
|
|||
void setMenu(const QList<QMenu *> &newMenuList = QList<QMenu *>());
|
||||
void localGameEnded();
|
||||
void adminLockChanged(bool lock);
|
||||
void maximize();
|
||||
void showWindowIfHidden();
|
||||
public slots:
|
||||
TabDeckEditor *addDeckEditorTab(const DeckLoader *deckToOpen);
|
||||
void openReplay(GameReplay *replay);
|
||||
|
|
|
@ -599,7 +599,7 @@ MainWindow::MainWindow(QWidget *parent)
|
|||
tabSupervisor = new TabSupervisor(client);
|
||||
connect(tabSupervisor, SIGNAL(setMenu(QList<QMenu *>)), this, SLOT(updateTabMenu(QList<QMenu *>)));
|
||||
connect(tabSupervisor, SIGNAL(localGameEnded()), this, SLOT(localGameEnded()));
|
||||
connect(tabSupervisor, SIGNAL(maximize()), this, SLOT(maximize()));
|
||||
connect(tabSupervisor, SIGNAL(showWindowIfHidden()), this, SLOT(showWindowIfHidden()));
|
||||
tabSupervisor->addDeckEditorTab(0);
|
||||
|
||||
setCentralWidget(tabSupervisor);
|
||||
|
@ -703,8 +703,10 @@ void MainWindow::pixmapCacheSizeChanged(int newSizeInMBs)
|
|||
QPixmapCache::setCacheLimit(newSizeInMBs * 1024);
|
||||
}
|
||||
|
||||
void MainWindow::maximize() {
|
||||
showNormal();
|
||||
void MainWindow::showWindowIfHidden() {
|
||||
// keep the previous window state
|
||||
setWindowState(windowState() & ~Qt::WindowMinimized);
|
||||
show();
|
||||
}
|
||||
|
||||
/* CARD UPDATER */
|
||||
|
|
|
@ -69,7 +69,7 @@ private slots:
|
|||
|
||||
void iconActivated(QSystemTrayIcon::ActivationReason reason);
|
||||
|
||||
void maximize();
|
||||
void showWindowIfHidden();
|
||||
|
||||
void actCheckCardUpdates();
|
||||
void cardUpdateError(QProcess::ProcessError err);
|
||||
|
|
Loading…
Reference in a new issue