X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=b44f7ddebdee5374918054ce56f796833e21c094;hp=5b430870d35b0115461d77fd5608a421de71c01e;hb=b709cbc76fc0bd0f14839b4c04ba8caf78d775f1;hpb=c0bbc724cda7acf652d9d2ce80605ebb53c4a2ff

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 5b430870..b44f7dde 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -266,9 +266,8 @@ void MainWin::setupTopicWidget() {
 void MainWin::setupSystray() {
   systray = new QSystemTrayIcon(this);
   systray->setIcon(QIcon(":/icons/quassel-icon.png"));
-
-  QString toolTip("Left click to minimize the Quassel Client to tray");
-  systray->setToolTip(toolTip);
+//  systray->setToolTip("left click to minimize the quassel client to tray");
+//  systray->setToolTip(toolTip);
 
   systrayMenu = new QMenu(this);
   systrayMenu->addAction(ui.actionAboutQuassel);
@@ -298,6 +297,7 @@ void MainWin::changeEvent(QEvent *event) {
       QtUiSettings s;
       if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnMinimize").toBool()) {
         toggleVisibility();
+        event->ignore();
       }
     }
   }
@@ -374,7 +374,7 @@ void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReas
 }
 
 void MainWin::toggleVisibility() {
-  if(isHidden() || !isActiveWindow()) {
+  if(isHidden() /*|| !isActiveWindow()*/) {
     show();
     if(isMinimized())
       if (isMaximized())
@@ -383,9 +383,11 @@ void MainWin::toggleVisibility() {
         showNormal();
 
     raise();
-    activateWindow();
+    setFocus(Qt::ActiveWindowFocusReason);
+    // activateWindow();
   } else {
     if(systray->isSystemTrayAvailable ()) {
+      clearFocus();
       hide();
       if(!systray->isVisible()) {
         systray->show();