Changeset 432

Timestamp:

Dec 18, 2009, 2:36:30 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Fixed: Popups shown when another application is active were not controllable with keyboard and didn't close on an outside mouse click (closes #113).

Location:

trunk/src/gui

Files:

• kernel/qapplication_pm.cpp (modified) (7 diffs)
• util/qsystemtrayicon_pm.cpp (modified) (4 diffs)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -110 +110 @@
 QPointer<QWidget> qt_last_mouse_receiver = 0;
 
+
+
+
 static HWND autoCaptureWnd = NULLHANDLE;
 static bool autoCaptureReleased = FALSE;
@@ -1016 +1019 @@
             }
 
-            case WM_SETFOCUS: {
+            case WM_: {
                 HWND hwnd = (HWND)mp1;
                 bool focus = SHORT1FROMMP(mp2);
@@ -1023 +1026 @@
                         // we don't get focus, so unset it now
                         if (QApplication::activePopupWidget()) {
+
                             // Another application was activated while our popups are open,
                             // then close all popups.  In case some popup refuses to close,
@@ -1437 +1441 @@
         return;
 
-    if (QApplicationPrivate::popupWidgets->count() == 1 && !qt_nograb()) {
-        Q_ASSERT(popup->testAttribute(Qt::WA_WState_Created));
-        setAutoCapture(popup->d_func()->frameWinId()); // grab mouse/keyboard
-    }
+    if (QApplicationPrivate::popupWidgets->count() == 1) {
+        if (!qt_nograb()) {
+            Q_ASSERT(popup->testAttribute(Qt::WA_WState_Created));
+            setAutoCapture(popup->d_func()->frameWinId()); // grab mouse/keyboard
+        }
+        if (!qWidgetFromHWND(WinQueryActiveWindow(HWND_DESKTOP))) {
+            // the popup is opened while another application is active. Steal
+            // the focus (to receive keyboard input and to make sure we get
+            // WM_FOCUSCHANGE when clicked outside) but not the active state.
+            ULONG flags = FC_NOSETACTIVE | FC_NOLOSEACTIVE;
+            WinFocusChange(HWND_DESKTOP, popup->d_func()->frameWinId(), flags);
+            foreignActiveWnd = WinQueryActiveWindow(HWND_DESKTOP);
+        }
+    }
+
     // Popups are not focus-handled by the window system (the first
     // popup grabbed the keyboard), so we have to do that manually: A
@@ -1464 +1479 @@
     curPos.y = q_func()->desktop()->height() - (curPos.y + 1);
 
-    if (QApplicationPrivate::popupWidgets->isEmpty()) { // this was the last popup
+    if (QApplicationPrivate::popupWidgets->isEmpty()) {
+        // this was the last popup
+        if (foreignActiveWnd != NULLHANDLE && foreignFocusWnd != NULLHANDLE) {
+            // we stole focus from another application so PM won't send it
+            // WM_ACTIVATE(FALSE). Our duty is to do it for PM.
+            HWND parent, desktop = WinQueryDesktopWindow(0, NULLHANDLE);
+            // find the top-level window of the window actually getting focus
+            while ((parent = WinQueryWindow(foreignFocusWnd, QW_PARENT)) != desktop)
+                foreignFocusWnd = parent;
+            // send deactivation to the old active window if it differs
+            if (foreignFocusWnd != foreignActiveWnd)
+                WinSendMsg(foreignActiveWnd, WM_ACTIVATE, (MPARAM)FALSE, (MPARAM)foreignActiveWnd);
+        }
+        foreignActiveWnd = NULLHANDLE;
+        foreignFocusWnd = NULLHANDLE;
+
         delete QApplicationPrivate::popupWidgets;
         QApplicationPrivate::popupWidgets = 0;
@@ -2553 +2583 @@
         HWND hwnd = (HWND)qmsg.mp2;
         str += QCStr(" Active(") + QCStr(active ? "TRUE) " : "FALSE)");
-        str += QString().sprintf(" hwnd %08lX.", hwnd);
+        str += QString().sprintf(" hwnd %08lX.", hwnd);
         str += qWidgetName(qWidgetFromHWND(hwnd));
         break;
@@ -2562 +2592 @@
         bool focus = SHORT1FROMMP(qmsg.mp2);
         str += QCStr(" Focus(") + QCStr(focus ? "TRUE) " : "FALSE)");
-        str += QString().sprintf(" hwnd %08lX.", hwnd);
+        str += QString().sprintf(" hwnd %08lX.", hwnd);
         str += qWidgetName(qWidgetFromHWND(hwnd));
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         break;
     myCaseEnd()

trunk/src/gui/util/qsystemtrayicon_pm.cpp

@@ -158 +158 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 bool QSystemTrayIconSys::pmEvent(QMSG *msg, MRESULT *result)
 {
@@ -165 +179 @@
             switch (SHORT2FROMMP(msg->mp1)) {
                 case XST_IN_MOUSE: {
+
                     PXSTMOUSEMSG pMsg = (PXSTMOUSEMSG)msg->mp2;
                     switch (pMsg->ulMouseMsg) {
@@ -182 +197 @@
                 }
                 case XST_IN_CONTEXT: {
+
+
+
+
+
+
+
+
+
+
+
+
                     PXSTCONTEXTMSG pMsg = (PXSTCONTEXTMSG)msg->mp2;
                     if (q->contextMenu()) {
@@ -196 +223 @@
                     break;
                 }
+
+
+
                 default:
                     break;