summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-06-15 18:45:22 +0200
committerGitHub <noreply@github.com>2017-06-15 18:45:22 +0200
commit0a339f14a8a357927e5f1a5538f47f571ddbe774 (patch)
treeecc814efd13402a6b1ea8d417fe4f63047221fb7 /platform
parent5077d2d28d62218590a5792673a246b6137622d4 (diff)
parentdd2b7ef747de880d7e437c3e4116cf796f55c249 (diff)
Merge pull request #9198 from vnen/fix-wheel-pos
Fix MouseWheel position on Windows
Diffstat (limited to 'platform')
-rw-r--r--platform/windows/os_windows.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index 4393cad3bf..e94529dd94 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -543,8 +543,6 @@ LRESULT OS_Windows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
mb->set_position(Vector2(old_x, old_y));
}
- mb->set_global_position(mb->get_position());
-
if (uMsg != WM_MOUSEWHEEL) {
if (mb->is_pressed()) {
@@ -568,6 +566,8 @@ LRESULT OS_Windows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
mb->set_position(Vector2(coords.x, coords.y));
}
+ mb->set_global_position(mb->get_position());
+
if (main_loop) {
input->parse_input_event(mb);
if (mb->is_pressed() && mb->get_button_index() > 3) {