From ab21722653f036a8d04dbeb3fe4e12cfa5f9757d Mon Sep 17 00:00:00 2001
From: Thorvald Natvig <slicer@users.sourceforge.net>
Date: Tue, 9 Mar 2010 15:08:15 +0100
Subject: [PATCH] Fix restore to maximize state on tray click

---
 src/mumble/MainWindow.cpp | 16 +++++-----------
 src/mumble/MainWindow.h   |  2 --
 src/mumble/Overlay.cpp    |  2 --
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp
index b3f4bdb50..e4569d8a3 100644
--- a/src/mumble/MainWindow.cpp
+++ b/src/mumble/MainWindow.cpp
@@ -151,7 +151,6 @@ MainWindow::MainWindow(QWidget *p) : QMainWindow(p) {
 	banEdit = NULL;
 	userEdit = NULL;
 	tokenEdit = NULL;
-	bNoHide = false;
 
 	uiContextSession = ~0;
 	iContextChannel = -1;
@@ -392,13 +391,12 @@ void MainWindow::hideEvent(QHideEvent *e) {
 		e->ignore();
 		return;
 	}
-
 #ifndef Q_OS_MAC
 #ifdef Q_OS_UNIX
 	if (! qApp->activeModalWidget() && ! qApp->activePopupWidget())
 #endif
-		if (g.s.bHideTray && !bNoHide && qstiIcon->isSystemTrayAvailable())
-			qApp->postEvent(this, new QEvent(static_cast<QEvent::Type>(TI_QEVENT)));
+		if (g.s.bHideTray && qstiIcon->isSystemTrayAvailable() && e->spontaneous())
+			QMetaObject::invokeMethod(this, "hide", Qt::QueuedConnection);
 	QMainWindow::hideEvent(e);
 #endif
 }
@@ -659,18 +657,14 @@ void MainWindow::setOnTop(bool top) {
 			wf |= Qt::WindowStaysOnTopHint;
 		else
 			wf &= ~Qt::WindowStaysOnTopHint;
-		bNoHide = true;
 		setWindowFlags(wf);
 		show();
-		bNoHide = false;
 	}
 }
 
 void MainWindow::setupView(bool toggle_minimize) {
 	bool showit = ! g.s.bMinimalView;
 
-	bNoHide = true;
-
 	// Update window layout
 	Settings::WindowLayout wlTmp = g.s.wlWindowLayout;
 	switch (wlTmp) {
@@ -779,7 +773,6 @@ void MainWindow::setupView(bool toggle_minimize) {
 
 	show();
 	activateWindow();
-	bNoHide = false;
 }
 
 void MainWindow::on_qaServerConnect_triggered(bool autoconnect) {
@@ -2245,8 +2238,9 @@ void MainWindow::on_Icon_activated(QSystemTrayIcon::ActivationReason reason) {
 
 	if (reason == QSystemTrayIcon::Trigger) {
 		if (! isVisible()) {
-			show();
-			if (isMinimized())
+			if (isMaximized())
+				showMaximized();
+			else
 				showNormal();
 			activateWindow();
 		} else {
diff --git a/src/mumble/MainWindow.h b/src/mumble/MainWindow.h
index ef115c52c..cc3d0c77a 100644
--- a/src/mumble/MainWindow.h
+++ b/src/mumble/MainWindow.h
@@ -98,8 +98,6 @@ class MainWindow : public QMainWindow, public MessageHandler, public Ui::MainWin
 		bool bSuppressAskOnQuit;
 		bool bAutoUnmute;
 
-		bool bNoHide;
-
 		unsigned int uiContextSession;
 		int iContextChannel;
 
diff --git a/src/mumble/Overlay.cpp b/src/mumble/Overlay.cpp
index d712ad3b1..370937f2d 100644
--- a/src/mumble/Overlay.cpp
+++ b/src/mumble/Overlay.cpp
@@ -2115,12 +2115,10 @@ void OverlayClient::hideGui() {
 	if (g.ocIntercept == this)
 		g.ocIntercept = NULL;
 
-	g.mw->bNoHide = true;
 	foreach(QWidget *w, widgetlist) {
 		if (bWasVisible)
 			w->show();
 	}
-	g.mw->bNoHide = false;
 
 	setupScene(false);