Changeset 64 for psi

Timestamp:

Sep 22, 2006, 1:05:38 AM (18 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).

Location:

psi/trunk/src

Files:

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

psi/trunk/src/common.cpp

@@ -1951 +1951 @@
 #ifdef Q_WS_WIN
         w->raise();
-        if (grabFocus)
+        if (grabFocus) {
                 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
 
-#if defined(Q_WS_WIN)
+/// @todo (r=dmik) I don't fully understand what is this code good for, but
+//      at least it doesn't do what it should (for example, if the roster window is
+//      minimized, it won't be shown). Instead we use bringToFront() just like on
+//      any other platform (the *fixed* version of bringToFront() seems to work ok).
+#if 0 && defined(Q_WS_WIN)
 #include<windows.h>
 void MainWin::showNoFocus()
@@ -1172 +1176 @@
 void MainWin::showNoFocus()
 {
-        bringToFront(this);
-}
-
-#endif
+#if defined(QT_ACCESSIBILITY_SUPPORT)
+        QAccessible::updateAccessibility( this, 0, QAccessible::ObjectShow );
+#endif
+        bringToFront(this, false);
+}
+
+#endif

psi/trunk/src/options/opt_events.cpp

@@ -45 +45 @@
                 "Set this option if you want them to popup anyway."));
         QWhatsThis::add(d->ck_raise,
-                tr("Makes new incoming events bring the main window to the foreground."));
+                tr("Makes new incoming events bring the main window to the foreground."
+                " It does not take the keyboard focus, so it will not interfere with your work."));
         QWhatsThis::add(d->ck_ignoreNonRoster,
                 tr("Makes Psi ignore all incoming events from contacts"