diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-02-17 09:43:31 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-02-17 09:43:31 (GMT) |
| commit | f2af6385246205acfd65d83ad3df3741d4f4ac7e (patch) | |
| tree | e26ed57a6fb599d757bd723de3caf31355921f59 | |
| parent | 632088ecc8c5270bb5af7ccd5481c74a80a909ba (diff) | |
| parent | 234e849cfc85d5618d2f703bb92701042993d2de (diff) | |
| download | Qt-f2af6385246205acfd65d83ad3df3741d4f4ac7e.zip Qt-f2af6385246205acfd65d83ad3df3741d4f4ac7e.tar.gz Qt-f2af6385246205acfd65d83ad3df3741d4f4ac7e.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1
| -rw-r--r-- | src/gui/kernel/qapplication_win.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp index b71a1bb..31d245f 100644 --- a/src/gui/kernel/qapplication_win.cpp +++ b/src/gui/kernel/qapplication_win.cpp @@ -2984,7 +2984,10 @@ bool QETWidget::translateMouseEvent(const MSG &msg) // most recent one. msgPtr->lParam = mouseMsg.lParam; msgPtr->wParam = mouseMsg.wParam; - msgPtr->pt = mouseMsg.pt; + // Extract the x,y coordinates from the lParam as we do in the WndProc + msgPtr->pt.x = GET_X_LPARAM(mouseMsg.lParam); + msgPtr->pt.y = GET_Y_LPARAM(mouseMsg.lParam); + ClientToScreen(msg.hwnd, &(msgPtr->pt)); // Remove the mouse move message PeekMessage(&mouseMsg, msg.hwnd, WM_MOUSEMOVE, WM_MOUSEMOVE, PM_REMOVE); |