ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-01-22 23:11:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'issue_488_input_events_fired_more_than_once' into 488_fix2

Browse source
This commit is contained in:
David Jeske 2017-06-12 09:16:01 -07:00
parent f1fed27afd 3bbd31d66b
commit 2d702337d2
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/OpenTK/Platform/Windows/WinGLNative.cs
View file

@ -755,43 +755,43 @@ namespace OpenTK.Platform.Windows
case WindowMessage.MOUSEWHEEL: case WindowMessage.MOUSEWHEEL:
HandleMouseWheel(handle, message, wParam, lParam); HandleMouseWheel(handle, message, wParam, lParam);
break; return IntPtr.Zero;
case WindowMessage.MOUSEHWHEEL: case WindowMessage.MOUSEHWHEEL:
HandleMouseHWheel(handle, message, wParam, lParam); HandleMouseHWheel(handle, message, wParam, lParam);
break; return IntPtr.Zero;
case WindowMessage.LBUTTONDOWN: case WindowMessage.LBUTTONDOWN:
HandleLButtonDown(handle, message, wParam, lParam); HandleLButtonDown(handle, message, wParam, lParam);
break; return IntPtr.Zero;
case WindowMessage.MBUTTONDOWN: case WindowMessage.MBUTTONDOWN:
HandleMButtonDown(handle, message, wParam, lParam); HandleMButtonDown(handle, message, wParam, lParam);
break; return IntPtr.Zero;
case WindowMessage.RBUTTONDOWN: case WindowMessage.RBUTTONDOWN:
HandleRButtonDown(handle, message, wParam, lParam); HandleRButtonDown(handle, message, wParam, lParam);
break; return IntPtr.Zero;
case WindowMessage.XBUTTONDOWN: case WindowMessage.XBUTTONDOWN:
HandleXButtonDown(handle, message, wParam, lParam); HandleXButtonDown(handle, message, wParam, lParam);
break; return IntPtr.Zero;
case WindowMessage.LBUTTONUP: case WindowMessage.LBUTTONUP:
HandleLButtonUp(handle, message, wParam, lParam); HandleLButtonUp(handle, message, wParam, lParam);
break; return IntPtr.Zero;
case WindowMessage.MBUTTONUP: case WindowMessage.MBUTTONUP:
HandleMButtonUp(handle, message, wParam, lParam); HandleMButtonUp(handle, message, wParam, lParam);
break; return IntPtr.Zero;
case WindowMessage.RBUTTONUP: case WindowMessage.RBUTTONUP:
HandleRButtonUp(handle, message, wParam, lParam); HandleRButtonUp(handle, message, wParam, lParam);
break; return IntPtr.Zero;
case WindowMessage.XBUTTONUP: case WindowMessage.XBUTTONUP:
HandleXButtonUp(handle, message, wParam, lParam); HandleXButtonUp(handle, message, wParam, lParam);
break; return IntPtr.Zero;
// Keyboard events: // Keyboard events:
case WindowMessage.KEYDOWN: case WindowMessage.KEYDOWN:
@ -841,7 +841,7 @@ namespace OpenTK.Platform.Windows
{ {
if (mouse_capture_count == 0) if (mouse_capture_count == 0)
{ {
Functions.SetCapture(window.Handle); Functions.SetCapture(child_window.Handle);
} }
mouse_capture_count++; mouse_capture_count++;
} }