Changeset 64

Timestamp:

09/22/06 01:05:38 (2 years ago)

Author:

dmik

Message:

Psi: Fixed "bring to front" functionality:
- Roster window took the keyboard focus if the "Raise Roster Window On New Event" was set.
- [Win32] bringToFront() didn't actually put the window on top of the active window (as on all other platforms).

Files:

• psi/trunk/src/common.cpp (modified) (1 diff)
• psi/trunk/src/mainwin.cpp (modified) (2 diffs)
• psi/trunk/src/options/opt_events.cpp (modified) (1 diff)

psi/trunk/src/common.cpp

@@ -1951 +1951 @@
-#ifdef Q_WS_WIN
-        w->raise();
-
+ {
-                w->setActiveWindow();
+        } else {
+                if (GetTopWindow(NULL) != w->winId()) { 
+                        // On Win32, raise() cannot move a window on top of the currently
+                        // active window w/o making the former active. To overcome this,
+                        // we use a trick by first making the window floating on top and
+                        // then restoring the normal behavior. 
+                        SetWindowPos(w->winId(), HWND_TOPMOST, 0, 0, 0, 0,
+                                                 SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE);
+                        SetWindowPos(w->winId(), HWND_NOTOPMOST, 0, 0, 0, 0,
+                                                 SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE);
+                }
+        }
-#else
-        if(grabFocus)

psi/trunk/src/mainwin.cpp

@@ -1088 +1088 @@
-#endif
-
-
+
+
+
+
+
-#include<windows.h>
-void MainWin::showNoFocus()
@@ -1172 +1176 @@
-void MainWin::showNoFocus()
-{
-
-
-
-
+
+
+
+
+
+
+

psi/trunk/src/options/opt_events.cpp

@@ -45 +45 @@
-                "Set this option if you want them to popup anyway."));
-        QWhatsThis::add(d->ck_raise,
-
+
+
-        QWhatsThis::add(d->ck_ignoreNonRoster,
-                tr("Makes Psi ignore all incoming events from contacts"