aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1485 from ctrlaltca/fix_notification_click

Browse source 
Don't change window maximized state when clicking a notification
This commit is contained in:
Zach 2015-09-08 12:49:00 -04:00
commit aac980a8cb
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/tab_supervisor.cpp
View file

@ -437,7 +437,7 @@ TabMessage *TabSupervisor::addMessageTab(const QString &receiverName, bool focus
}
void TabSupervisor::maximizeMainWindow() {
emit maximize();
emit showWindowIfHidden();
}
void TabSupervisor::talkLeft(TabMessage *tab)

2
cockatrice/src/tab_supervisor.h
View file

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

8
cockatrice/src/window_main.cpp
View file

@ -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 */

2
cockatrice/src/window_main.h
View file

@ -69,7 +69,7 @@ private slots:
void iconActivated(QSystemTrayIcon::ActivationReason reason);
void maximize();
void showWindowIfHidden();
void actCheckCardUpdates();
void cardUpdateError(QProcess::ProcessError err);