From 7174d706aa34ad9adcb8489d2cf7ea86d3bb6ba4 Mon Sep 17 00:00:00 2001 From: George Marques Date: Thu, 15 Jun 2017 13:18:58 -0300 Subject: [PATCH] Fix MouseWheel position on Windows --- platform/windows/os_windows.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 1c49f1c91e5..02d2f0c99d5 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -511,8 +511,7 @@ LRESULT OS_Windows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) if (motion < 0) { mb.button_index = BUTTON_WHEEL_LEFT; mb.factor = fabs((double)motion / (double)WHEEL_DELTA); - } - else { + } else { mb.button_index = BUTTON_WHEEL_RIGHT; mb.factor = fabs((double)motion / (double)WHEEL_DELTA); } @@ -550,9 +549,6 @@ LRESULT OS_Windows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) mb.y = old_y; } - mb.global_x = mb.x; - mb.global_y = mb.y; - if (uMsg != WM_MOUSEWHEEL) { if (mb.pressed) { @@ -577,6 +573,9 @@ LRESULT OS_Windows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) mb.y = coords.y; } + mb.global_x = mb.x; + mb.global_y = mb.y; + if (main_loop) { input->parse_input_event(event); if (mb.pressed && mb.button_index > 3) {