Changeset 504 for trunk/src/gui/kernel/qapplication_pm.cpp

Timestamp:

Feb 3, 2010, 12:06:04 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui/kernel: Fixed: Mouse press events replayed after closing the popup by clicking outside it had incorrect coordinates. This resulted into various kinds of misbehavior including spatial text selection in QTextEdit widgets after closing popups by clicking inside these widgets.

File:

• trunk/src/gui/kernel/qapplication_pm.cpp (modified) (2 diffs)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -1898 +1898 @@
             // in order to give non-Qt windows the opportunity to see mouse
             // messages while our popups are active we need to release the
-            // mouse capture which is absolute in OS/2. we do it directly
+            // mouse capture which is absolute in OS/2. e do it directly
             // (not through releaseAutoCapture()) in order to keep
-            // autoCaptureWnd nonzero to keep forwarding mouse move events
-            // (actually sent to one of Qt widgets) to the active popup.
+            // autoCaptureWnd nonzero 
+            //  to the active popup.
             autoCaptureReleased = true;
             WinSetCapture(HWND_DESKTOP, 0);
@@ -1996 +1996 @@
                 if (!w->isActiveWindow())
                     w->activateWindow();
-                POINTL pt = gpos;
-                WinMapWindowPoints(HWND_DESKTOP, hwndTarget, &pt, 1);
+                POINTL ptl = gpos;
                 // flip y coordinate
-                pt.y = w->height() - (pt.y + 1);
+                ptl.y = QApplication::desktop()->height() - (ptl.y + 1);
+                WinMapWindowPoints(HWND_DESKTOP, hwndTarget, &ptl, 1);
                 WinPostMsg(hwndTarget, qmsg.msg,
-                           MPFROM2SHORT(pt.x, pt.y), qmsg.mp2);
+                           MPFROM2SHORT(pt.y), qmsg.mp2);
             }
         }