Changeset 6145 for trunk/qt4-gui/src/core/licqgui.cpp

Timestamp:

04/12/08 21:25:28 (8 months ago)

Author:

flynd

Message:

Improved event auto popup to prevent focus stealing from other event windows. Focus is still stolen when opening new windows and minimized windows do not become active after they are restored.

Files:

• trunk/qt4-gui/src/core/licqgui.cpp (modified) (5 diffs)

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

@@ -870 +870 @@
     return NULL;
 
+  // Check if a message window should be made active
+  bool activateMsgwin = Config::Chat::instance()->autoFocus();
+
+  // Don't change focus if another message window is already active
+  const QWidget* activeWin = QApplication::activeWindow();
+  if (activeWin != NULL && ((qobject_cast<const UserEventCommon*>(activeWin)) != NULL ||
+      (qobject_cast<const UserEventTabDlg*>(activeWin)) != NULL))
+    activateMsgwin = false;
+
   if (Config::Chat::instance()->msgChatView())
   {
@@ -886 +895 @@
         //  e->convoJoin(id);
 
-        if (myUserEventTabDlg && myUserEventTabDlg->tabExists(e))
+        QWidget* msgWindow = e;
+        if (myUserEventTabDlg != NULL && myUserEventTabDlg->tabExists(e))
         {
-          myUserEventTabDlg->show();
-          if (Config::Chat::instance()->autoFocus())
-          {
+          msgWindow = myUserEventTabDlg;
+          if (activateMsgwin)
             myUserEventTabDlg->selectTab(e);
-            myUserEventTabDlg->raise();
-            myUserEventTabDlg->activateWindow();
-          }
         }
-        else
+
+        msgWindow->show();
+        msgWindow->setWindowState(msgWindow->windowState() & ~Qt::WindowMinimized);
+        if (activateMsgwin)
         {
-          e->show();
-          if (Config::Chat::instance()->autoFocus() &&
-              (!qApp->activeWindow() || !qApp->activeWindow()->inherits("UserEventCommon")))
-          {
-            e->raise();
-            e->activateWindow();
-          }
+          // FIXME: When restoring from minimized, the window isn't activated (at least not on KDE)
+          msgWindow->raise();
+          msgWindow->activateWindow();
         }
+
         // Make the existing event dialog change to the new event type
         e->changeEventType(fcn);
@@ -917 +923 @@
   if (Config::Chat::instance()->tabbedChatting())
   {
-    if (myUserEventTabDlg != NULL)
-    {
-      if (Config::Chat::instance()->autoFocus())
-      {
-        myUserEventTabDlg->raise();
-        myUserEventTabDlg->activateWindow();
-      }
-    }
-    else
+    if (myUserEventTabDlg == NULL)
     {
       // create the tab dialog if it does not exist
@@ -970 +968 @@
   connect(e, SIGNAL(viewUrl(QWidget*, QString)), SLOT(viewUrl(QWidget*, QString)));
 
+  QWidget* msgWindow = e;
   if (Config::Chat::instance()->tabbedChatting())
   {
+    msgWindow = myUserEventTabDlg;
+
     myUserEventTabDlg->addTab(e);
-    myUserEventTabDlg->show();
-    if (newtabw)
-      e->setFocus();
-
-    if (Config::Chat::instance()->autoFocus())
-    {
-      myUserEventTabDlg->raise();
-      myUserEventTabDlg->activateWindow();
-    }
+    if (activateMsgwin)
+      myUserEventTabDlg->selectTab(e);
 
     // Check if we want the window sticky
@@ -987 +981 @@
       QTimer::singleShot(100, myUserEventTabDlg, SLOT(slotSetMsgWinSticky()));
   }
-  else
-    e->show();
+
+  // FIXME: New windows always become active stealing focus from other event windows (at least on KDE)
+  msgWindow->show();
+  msgWindow->setWindowState(msgWindow->windowState() & ~Qt::WindowMinimized);
+  if (activateMsgwin)
+  {
+    // FIXME: When restoring from minimized, the window isn't activated (at least not on KDE)
+    msgWindow->raise();
+    msgWindow->activateWindow();
+  }
 
   // there might be more than one send window open