godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9197 from vnen/fix-wheel-pos

Browse Source 
Fix MouseWheel position on Windows
This commit is contained in:
Rémi Verschelde 2017-06-15 18:24:48 +02:00 committed by GitHub
commit 90a07122c2
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
platform/windows/os_windows.cpp
View File

@ -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) {