Fix for Qt issue #218037 - Add support for the WM_MOUSEHWHEEL message on Windows

Merge-request: 384
Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>

4 files changed, 21 insertions, 3 deletions

diff --git a/src/corelib/global/qt_windows.h b/src/corelib/global/qt_windows.h
index 2ce4059..7fc7f47 100644
--- a/src/corelib/global/qt_windows.h
+++ b/src/corelib/global/qt_windows.h
@@ -106,6 +106,9 @@
 #ifndef WM_MOUSEWHEEL
 #define WM_MOUSEWHEEL 0x020A
 #endif
+#ifndef WM_MOUSEHWHEEL
+#define WM_MOUSEHWHEEL 0x020E
+#endif
 #ifndef ETO_PDY
 #define ETO_PDY 0x2000
 #endif
diff --git a/src/corelib/kernel/qcoreapplication_win.cpp b/src/corelib/kernel/qcoreapplication_win.cpp
index 815a558..9c1c235 100644
--- a/src/corelib/kernel/qcoreapplication_win.cpp
+++ b/src/corelib/kernel/qcoreapplication_win.cpp
@@ -409,6 +409,7 @@ struct {
  { 0x020B, "WM_XBUTTONDOWN" },
  { 0x020C, "WM_XBUTTONUP" },
  { 0x020D, "WM_XBUTTONDBLCLK" },
+ { 0x020E, "WM_MOUSEHWHEEL" },
  { 0x0210, "WM_PARENTNOTIFY" },
  { 0x0211, "WM_ENTERMENULOOP" },
  { 0x0212, "WM_EXITMENULOOP" },
@@ -898,6 +899,9 @@ QString decodeMSG(const MSG& msg)
 #ifdef WM_MOUSEWHEEL
         case WM_MOUSEWHEEL:
 #endif
+#ifdef WM_MOUSEHWHEEL
+        case WM_MOUSEHWHEEL:
+#endif
 #ifdef WM_LBUTTONDBLCLK
         case WM_LBUTTONDBLCLK:
 #endif
diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp
index 2dd5534..7d3a13a 100644
--- a/src/corelib/kernel/qeventdispatcher_win.cpp
+++ b/src/corelib/kernel/qeventdispatcher_win.cpp
@@ -696,7 +696,8 @@ bool QEventDispatcherWin32::processEvents(QEventLoop::ProcessEventsFlags flags)
                          && msg.message <= WM_KEYLAST)
                         || (msg.message >= WM_MOUSEFIRST
                             && msg.message <= WM_MOUSELAST)
-                        || msg.message == WM_MOUSEWHEEL)) {
+                        || msg.message == WM_MOUSEWHEEL
+                        || msg.message == WM_MOUSEHWHEEL)) {
                     // queue user input events for later processing
                     haveMessage = false;
                     d->queuedUserInputEvents.append(msg);
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index 7e97784..60f3edf 100644
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/kernel/qapplication_win.cpp
@@ -1408,6 +1408,7 @@ static bool qt_is_translatable_mouse_event(UINT message)
     return (message >= WM_MOUSEFIRST && message <= WM_MOUSELAST ||
                 message >= WM_XBUTTONDOWN && message <= WM_XBUTTONDBLCLK)
             && message != WM_MOUSEWHEEL
+            && message != WM_MOUSEHWHEEL
 
 #ifndef Q_WS_WINCE
             || message >= WM_NCMOUSEMOVE && message <= WM_NCMBUTTONDBLCLK
@@ -1758,6 +1759,7 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
             break;
 
         case WM_MOUSEWHEEL:
+        case WM_MOUSEHWHEEL:
             result = widget->translateWheelEvent(msg);
             break;
 
@@ -2657,6 +2659,7 @@ bool qt_try_modal(QWidget *widget, MSG *msg, int& ret)
 #endif
         if ((type >= WM_MOUSEFIRST && type <= WM_MOUSELAST) ||
              type == WM_MOUSEWHEEL || type == (int)WM95_MOUSEWHEEL ||
+             type == WM_MOUSEHWHEEL ||
              type == WM_MOUSELEAVE ||
              (type >= WM_KEYFIRST && type <= WM_KEYLAST)
 #ifndef Q_WS_WINCE
@@ -3268,12 +3271,12 @@ bool QETWidget::translateWheelEvent(const MSG &msg)
     state = translateButtonState(GET_KEYSTATE_WPARAM(msg.wParam), 0, 0);
 
     int delta;
-    if (msg.message == WM_MOUSEWHEEL)
+    if (msg.message == WM_MOUSEWHEEL || msg.message == WM_MOUSEHWHEEL)
         delta = (short) HIWORD (msg.wParam);
     else
         delta = (int) msg.wParam;
 
-    Qt::Orientation orient = (state&Qt::AltModifier
+    Qt::Orientation orient = (msg.message == WM_MOUSEHWHEEL || state&Qt::AltModifier
 #if 0
     // disabled for now - Trenton's one-wheel mouse makes trouble...
     // "delta" for usual wheels is +-120. +-240 seems to indicate
@@ -3287,6 +3290,13 @@ bool QETWidget::translateWheelEvent(const MSG &msg)
 #endif
        ) ? Qt::Horizontal : Qt::Vertical;
 
+    // according to the MSDN documentation on WM_MOUSEHWHEEL:
+    // a positive value indicates that the wheel was rotated to the right;
+    // a negative value indicates that the wheel was rotated to the left.
+    // Qt defines this value as the exact opposite, so we have to flip the value!
+    if (msg.message == WM_MOUSEHWHEEL)
+        delta = -delta;
+
     QPoint globalPos;
 
     globalPos.rx() = (short)LOWORD (msg.lParam);