Changeset 20 for psi

Timestamp:

Sep 5, 2006, 1:36:24 AM (18 years ago)

Author:

dmik

Message:

ChatDlg: Fixed: In the Tabbed chat mode, when 'Raise chat window on receiving new messages' was enabled, getting new messages for a contact in the hidden tab would highlight its title and make the corresponding chat dialog visible, but would not activate the tab handler.

File:

• psi/trunk/src/chatdlg.cpp (modified) (1 diff)

psi/trunk/src/chatdlg.cpp

@@ -1031 +1031 @@
         // if we're not active, notify the user by changing the title
         if(!isActiveWindow() || isHidden()) { //isHidden==tab hack
-                ++d->pending;
-                updateCaption();
-                doFlash(true);
-                if(option.raiseChatWindow)
-                        bringToFront(this, false);
+                if (!isActiveWindow() || !option.raiseChatWindow) {
+                        ++d->pending;
+                        updateCaption();
+                        doFlash(true);
+                }
+                TabDlg *dlg = d->pa->psi()->getManagingTabs(this);
+                if(option.raiseChatWindow) {
+                        if (!dlg) {
+                                bringToFront(this, false);
+                        } else {
+                                dlg->selectTab(this);
+                                bringToFront(dlg, false);
+                        }
+                }
         }
         //else {