jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
Download patch file Download diff file Expand all files Collapse all files

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