Changeset 46 for psi/trunk/src/chatdlg.cpp

Timestamp:

Sep 10, 2006, 6:51:11 PM (19 years ago)

Author:

dmik

Message:

Psi: ChatDlg: Changed chat window title emphasis logic (for tabbed chatting) to bring it into accordance with the bringToFront() fix (r:44): don't allow the emphasis to be removed until the chat tab has got input focus, even if we make it the selected one.

File:

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

psi/trunk/src/chatdlg.cpp

@@ -1029 +1029 @@
                 deferredScroll();
 
+        TabDlg *dlg = NULL;
+        AdvancedWidget<QWidget> *atlw = this;
+        if (d->pa->psi()->isChatTabbed(this)) {
+                dlg = d->pa->psi()->getManagingTabs(this);
+                atlw = dlg;
+        }
+        
         // if we're not active, notify the user by changing the title
-        if(!isActiveWindow() || isHidden()) { //isHidden==tab hack
-                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);
-                        }
-                }
+        if(!atlw->isActiveWindow() || (dlg && !dlg->chatOnTop(this))) {
+                // select the chat tab only if the Raise option is set but not when
+                // the tab dialog is already active (so that the user is typing to
+                // some other chat tab). Note that we do that before updateCaption()
+                // because selectTab() will remove any title emphasis (asterisk, etc)
+                if(option.raiseChatWindow && dlg && !dlg->isActiveWindow())
+                        dlg->selectTab(this);
+                ++d->pending;
+                updateCaption();
+                if(option.raiseChatWindow)
+                        bringToFront(atlw, false);
+                else
+                        atlw->doFlash(true);
         }
         //else {