diff --git a/src/video/windows/SDL_windowsevents.c b/src/video/windows/SDL_windowsevents.c index 923b69fe2afe3..66f43ce71292e 100644 --- a/src/video/windows/SDL_windowsevents.c +++ b/src/video/windows/SDL_windowsevents.c @@ -716,15 +716,9 @@ static void WIN_HandleRawMouseInput(Uint64 timestamp, SDL_VideoData *data, HANDL } } - if (rawmouse->usButtonFlags & RI_MOUSE_WHEEL) { - SHORT amount = (SHORT)rawmouse->usButtonData; - float fAmount = (float)amount / WHEEL_DELTA; - SDL_SendMouseWheel(timestamp, window, mouseID, 0.0f, fAmount, SDL_MOUSEWHEEL_NORMAL); - } else if (rawmouse->usButtonFlags & RI_MOUSE_HWHEEL) { - SHORT amount = (SHORT)rawmouse->usButtonData; - float fAmount = (float)amount / WHEEL_DELTA; - SDL_SendMouseWheel(timestamp, window, mouseID, fAmount, 0.0f, SDL_MOUSEWHEEL_NORMAL); - } + /* Note: We don't handle RI_MOUSE_WHEEL and RI_MOUSE_HWHEEL here because some + input devices have inverted wheel direction in raw mode. This avoids scroll + direction changing unexpectedly when entering/exiting relative mouse mode. */ /* Invalidate the mouse button flags. If we don't do this then disabling raw input will cause held down mouse buttons to persist when released. */ @@ -1539,14 +1533,12 @@ LRESULT CALLBACK WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara case WM_MOUSEWHEEL: case WM_MOUSEHWHEEL: { - if (!data->videodata->raw_mouse_enabled) { - short amount = GET_WHEEL_DELTA_WPARAM(wParam); - float fAmount = (float)amount / WHEEL_DELTA; - if (msg == WM_MOUSEWHEEL) { - SDL_SendMouseWheel(WIN_GetEventTimestamp(), data->window, SDL_GLOBAL_MOUSE_ID, 0.0f, fAmount, SDL_MOUSEWHEEL_NORMAL); - } else { - SDL_SendMouseWheel(WIN_GetEventTimestamp(), data->window, SDL_GLOBAL_MOUSE_ID, fAmount, 0.0f, SDL_MOUSEWHEEL_NORMAL); - } + short amount = GET_WHEEL_DELTA_WPARAM(wParam); + float fAmount = (float)amount / WHEEL_DELTA; + if (msg == WM_MOUSEWHEEL) { + SDL_SendMouseWheel(WIN_GetEventTimestamp(), data->window, SDL_GLOBAL_MOUSE_ID, 0.0f, fAmount, SDL_MOUSEWHEEL_NORMAL); + } else { + SDL_SendMouseWheel(WIN_GetEventTimestamp(), data->window, SDL_GLOBAL_MOUSE_ID, fAmount, 0.0f, SDL_MOUSEWHEEL_NORMAL); } } break;