mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #2685: MainWindow: disable MainWindow::changeEvent on macOS; it causes Mumble to be non-interactive after restoring from being minimized.

Browse Source
This commit is contained in:
Mikkel Krautz 2016-12-02 00:07:42 +01:00 committed by GitHub
commit c45298e445
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mumble/MainWindow.cpp
View File

@ -503,10 +503,19 @@ void MainWindow::showEvent(QShowEvent *e) {
void MainWindow::changeEvent(QEvent *e) {
QWidget::changeEvent(e);
#ifdef Q_OS_MAC
// On modern macOS/Qt combinations, the code below causes Mumble's
// MainWindow to not be interactive after returning from being minimized.
// (See issue mumble-voip/mumble#2171)
// So, let's not do it on macOS.
#else
if (isMinimized() && g.s.bHideInTray) {
// Workaround http://qt-project.org/forums/viewthread/4423/P15/#50676
QTimer::singleShot(0, this, SLOT(hide()));
}
#endif
}
void MainWindow::keyPressEvent(QKeyEvent *e) {