Changeset 6127 for trunk/qt4-gui/src/core

Timestamp:

04/05/08 19:15:52 (8 months ago)

Author:

flynd

Message:

Change behaviour on clicking the tray icon. If main window is visible but not active, it will now be activated instead of hidden.

Files:

• trunk/qt4-gui/src/core/mainwin.cpp (modified) (2 diffs)

trunk/qt4-gui/src/core/mainwin.cpp

@@ -311 +311 @@
 void MainWindow::trayIconClicked()
 {
-  if (isVisible() && !isMinimized())
+  if (isVisible() && !isMinimized() && isActiveWindow())
   {
     hide();
@@ -330 +330 @@
       setMainwinSticky(true);
 
+    activateWindow();
     raise();
   }