Skip to content
Permalink
Browse files

Revert "Fix issue with tray icon double clicking."

This reverts commit a120c8e.

Turns out this prevented Mumble from being able to raise
itself in front of a maximized application. The click
not being reported after using the activateWindow function
is probably a Qt bug and if it's reproducible in a small
sample should be reported.
  • Loading branch information...
hacst committed Oct 30, 2014
1 parent 236e987 commit 7d434bbfa5df0024c021d2647eb603a5947c6ec7
Showing with 7 additions and 2 deletions.
  1. +7 −2 src/mumble/MainWindow.cpp
@@ -2682,17 +2682,22 @@ void MainWindow::trayAboutToShow() {
}

void MainWindow::on_Icon_messageClicked() {
setWindowState((windowState() & ~Qt::WindowMinimized) | Qt::WindowActive);
if (isMinimized())
setWindowState((windowState() & ~Qt::WindowMinimized) | Qt::WindowActive);
show();
raise();
activateWindow();
}

void MainWindow::on_Icon_activated(QSystemTrayIcon::ActivationReason reason) {
switch (reason) {
case QSystemTrayIcon::Trigger:
case QSystemTrayIcon::DoubleClick:
case QSystemTrayIcon::MiddleClick:
on_Icon_messageClicked();
setWindowState((windowState() & ~Qt::WindowMinimized) | Qt::WindowActive);
show();
raise();
activateWindow();
default: break;
}
}

0 comments on commit 7d434bb

Please sign in to comment.
You can’t perform that action at this time.