Changeset 6424 for trunk/qt4-gui/src

Timestamp:

07/04/08 23:12:17 (5 months ago)

Author:

flynd

Message:

Always autofocus message window/tab if it's opened by the user.

Location:

trunk/qt4-gui/src/core

Files:

• licqgui.cpp (modified) (2 diffs)
• licqgui.h (modified) (1 diff)

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

@@ -818 +818 @@
 }
 
-UserEventCommon* LicqGui::showEventDialog(int fcn, QString id, unsigned long ppid, int convoId)
+UserEventCommon* LicqGui::showEventDialog(int fcn, QString id, unsigned long ppid, int convoId, bool autoPopup)
 {
   if (id.isEmpty() || ppid == 0)
     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;
+  // Focus the new window/tab after showing it
+  bool activateMsgwin = true;
+
+  if (autoPopup)
+  {
+    // Message is triggered by auto-popup (and not by user) so check if it
+    // really should be activated
+    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())
@@ -1483 +1490 @@
 
             if (bCallSendMsg)
-              showEventDialog(MessageEvent, id, ppid, sig->CID());
+              showEventDialog(MessageEvent, id, ppid, sig->CID(), true);
             if (bCallUserView)
               showViewEventDialog(id, ppid);

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

@@ -134 +134 @@
    * @param ppid Contact protocol id
    * @param convoId Conversation id
-   */
-  UserEventCommon* showEventDialog(int fcn, QString id, unsigned long ppid, int convoId = -1);
+   * @param autoPopup True if the dialog was triggered automatically, false if triggered by the user
+   */
+  UserEventCommon* showEventDialog(int fcn, QString id, unsigned long ppid, int convoId = -1, bool autoPopup = false);
 
   /**