Changeset 483 for trunk/src

Timestamp:

Jan 28, 2010, 7:19:03 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui/kernel: Fixed: Wrong widget-relative mouse position in mouse events. This fixes problems with dragging widget splitters (separators) in applications using dock widgets (such as qdesigner).

File:

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

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -1673 +1673 @@
 #endif
 
-    // Compress mouse move events
-    if (qmsg.msg == WM_MOUSEMOVE) {
-        QMSG mouseMsg;
-        mouseMsg.msg = WM_NULL;
-        while (WinPeekMsg(0, &mouseMsg, qmsg.hwnd, WM_MOUSEMOVE,
-                          WM_MOUSEMOVE, PM_NOREMOVE)) {
-                if (mouseMsg.mp2 != qmsg.mp2)
-                    break; // leave the message in the queue because
-                           // the key state has changed
-                // Remove the mouse move message
-                WinPeekMsg(0, &mouseMsg, qmsg.hwnd, WM_MOUSEMOVE,
-                           WM_MOUSEMOVE, PM_REMOVE);
-        }
-        // Update the passed in QMSG structure with the
-        // most recent one.
-        if (mouseMsg.msg != WM_NULL) {
-            PQMSG pqmsg = (PQMSG)&qmsg;
-            pqmsg->mp1 = mouseMsg.mp1;
-            pqmsg->mp2 = mouseMsg.mp2;
-            pqmsg->time = mouseMsg.time;
-            pqmsg->ptl.x = (short)SHORT1FROMMP(mouseMsg.mp1);
-            pqmsg->ptl.y = (short)SHORT2FROMMP(mouseMsg.mp1);
-            WinMapWindowPoints(pqmsg->hwnd, HWND_DESKTOP, &pqmsg->ptl, 1);
-            // flip y coordinate
-            pqmsg->ptl.y = QApplication::desktop()->height() - (pqmsg->ptl.y + 1);
-        }
-    }
-
     for (i = 0; mouseTbl[i] && (ULONG)mouseTbl[i] != qmsg.msg; i += 3)
         ;
@@ -1813 +1785 @@
 
         gpos = qmsg.ptl;
+
 
         Q_ASSERT(testAttribute(Qt::WA_WState_Created));
-
-        POINTL curPos = gpos;
-        WinMapWindowPoints(internalWinId(), HWND_DESKTOP, &curPos, 1);
-
-        pos.rx() = curPos.x;
-        pos.ry() = curPos.y;
-        pos = d_func()->mapFromWS(pos);
     } else {
         if (type == QEvent::MouseButtonPress && !isActiveWindow())
@@ -1827 +1793 @@
 
         gpos = qmsg.ptl;
-        pos = mapFromGlobal(QPoint(gpos.x, gpos.y));
+        pos = ;
 
         // mouse button pressed