From 6afb2ad58feba0e319e7e36205567697a55d6e1b Mon Sep 17 00:00:00 2001 From: David Jeske Date: Mon, 12 Jun 2017 09:16:32 -0700 Subject: [PATCH] Revert "Fix duplicate scroll input on windows 10" This reverts commit 9ef456bf9a9ae61e66559ce79927605fb7fe3fdc. --- src/OpenTK/Platform/Windows/WinGLNative.cs | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/OpenTK/Platform/Windows/WinGLNative.cs b/src/OpenTK/Platform/Windows/WinGLNative.cs index c5919b5..234c68a 100644 --- a/src/OpenTK/Platform/Windows/WinGLNative.cs +++ b/src/OpenTK/Platform/Windows/WinGLNative.cs @@ -97,9 +97,6 @@ namespace OpenTK.Platform.Windows IntPtr cursor_handle = Functions.LoadCursor(CursorName.Arrow); int cursor_visible_count = 0; - // tracking for w10 duplicate scroll inputs. - IntPtr scrollHandle; - static readonly object SyncRoot = new object(); #endregion @@ -537,12 +534,7 @@ namespace OpenTK.Platform.Windows { // This is due to inconsistent behavior of the WParam value on 64bit arch, whese // wparam = 0xffffffffff880000 or wparam = 0x00000000ff100000 - if (scrollHandle == IntPtr.Zero) { - scrollHandle = handle; - } - if (handle == scrollHandle) { - OnMouseWheel(0, ((long)wParam << 32 >> 48) / 120.0f); - } + OnMouseWheel(0, ((long)wParam << 32 >> 48) / 120.0f); } void HandleMouseHWheel(IntPtr handle, WindowMessage message, IntPtr wParam, IntPtr lParam) -- 2.7.4