From 366f5e334c898bef4b88605cf5cf2ee2feabffb1 Mon Sep 17 00:00:00 2001
From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Tue, 20 Jan 2009 22:31:53 +0100
Subject: [PATCH] This could / should / oh well you know the drill... just test
 if minimize to tray now works properly (BR #398)

---
 src/qtui/mainwin.cpp | 50 +++++++++++++++++---------------------------
 src/qtui/mainwin.h   |  3 ++-
 2 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index dbcbd853..4c39b122 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -509,10 +509,8 @@ void MainWin::setupSystray() {
   }
 
 #ifndef Q_WS_MAC
-  connect(systemTrayIcon(), SIGNAL(activated( QSystemTrayIcon::ActivationReason )),
-          this, SLOT(systrayActivated( QSystemTrayIcon::ActivationReason )));
+  connect(systemTrayIcon(), SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(systrayActivated(QSystemTrayIcon::ActivationReason)));
 #endif
-
 }
 
 void MainWin::changeEvent(QEvent *event) {
@@ -520,8 +518,8 @@ void MainWin::changeEvent(QEvent *event) {
     if(windowState() & Qt::WindowMinimized) {
       QtUiSettings s;
       if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnMinimize").toBool()) {
-        toggleVisibility();
-        event->ignore();
+	hideToTray();
+	event->accept();
       }
     }
   }
@@ -686,7 +684,7 @@ void MainWin::closeEvent(QCloseEvent *event) {
   QtUiApplication* app = qobject_cast<QtUiApplication*> qApp;
   Q_ASSERT(app);
   if(!app->aboutToQuit() && s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnClose").toBool()) {
-    toggleVisibility();
+    hideToTray();
     event->ignore();
   } else {
     event->accept();
@@ -694,37 +692,27 @@ void MainWin::closeEvent(QCloseEvent *event) {
   }
 }
 
-void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReason) {
+void MainWin::systrayActivated(QSystemTrayIcon::ActivationReason activationReason) {
   if(activationReason == QSystemTrayIcon::Trigger) {
-    toggleVisibility();
+    restoreFromTray();
   }
 }
 
-void MainWin::toggleVisibility() {
-  if(isHidden() /*|| !isActiveWindow()*/) {
-    show();
-    if(isMinimized()) {
-      if(isMaximized())
-        showMaximized();
-      else
-        showNormal();
-    }
+void MainWin::hideToTray() {
+  if(!systemTrayIcon()->isSystemTrayAvailable()) {
+    qWarning() << Q_FUNC_INFO << "was called with no SystemTray available!";
+    return;
+  }
 
-    raise();
-    activateWindow();
-    // setFocus(); //Qt::ActiveWindowFocusReason
+  clearFocus();
+  hide();
+  systemTrayIcon()->show();
+}
 
-  } else {
-    if(systemTrayIcon()->isSystemTrayAvailable ()) {
-      clearFocus();
-      hide();
-      if(!systemTrayIcon()->isVisible()) {
-        systemTrayIcon()->show();
-      }
-    } else {
-      lower();
-    }
-  }
+void MainWin::restoreFromTray() {
+  setWindowState(windowState() & ~Qt::WindowMinimized | Qt::WindowActive);
+  show();
+  raise();
 }
 
 void MainWin::messagesInserted(const QModelIndex &parent, int start, int end) {
diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index e3fdb615..59c0e2c2 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -149,7 +149,8 @@ class MainWin
     void setupTitleSetter();
 
     void updateIcon();
-    void toggleVisibility();
+    void hideToTray();
+    void restoreFromTray();
     void enableMenus();
 
     QSystemTrayIcon *_trayIcon;
-- 
2.20.1