From 3bbd31d66b1f34c4f19846484e0c62748350950d Mon Sep 17 00:00:00 2001 From: David Jeske Date: Sun, 11 Jun 2017 19:09:50 -0700 Subject: [PATCH] Fix SetCapture() to use child_window instead of window. As using window was causing spurious WM_MOUSELEAVE events. Also change other mouse events to return IntPtr.Zero when handled --- src/OpenTK/Platform/Windows/WinGLNative.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/OpenTK/Platform/Windows/WinGLNative.cs b/src/OpenTK/Platform/Windows/WinGLNative.cs index ef437d3..234c68a 100644 --- a/src/OpenTK/Platform/Windows/WinGLNative.cs +++ b/src/OpenTK/Platform/Windows/WinGLNative.cs @@ -755,35 +755,35 @@ namespace OpenTK.Platform.Windows case WindowMessage.LBUTTONDOWN: HandleLButtonDown(handle, message, wParam, lParam); - break; + return IntPtr.Zero; case WindowMessage.MBUTTONDOWN: HandleMButtonDown(handle, message, wParam, lParam); - break; + return IntPtr.Zero; case WindowMessage.RBUTTONDOWN: HandleRButtonDown(handle, message, wParam, lParam); - break; + return IntPtr.Zero; case WindowMessage.XBUTTONDOWN: HandleXButtonDown(handle, message, wParam, lParam); - break; + return IntPtr.Zero; case WindowMessage.LBUTTONUP: HandleLButtonUp(handle, message, wParam, lParam); - break; + return IntPtr.Zero; case WindowMessage.MBUTTONUP: HandleMButtonUp(handle, message, wParam, lParam); - break; + return IntPtr.Zero; case WindowMessage.RBUTTONUP: HandleRButtonUp(handle, message, wParam, lParam); - break; + return IntPtr.Zero; case WindowMessage.XBUTTONUP: HandleXButtonUp(handle, message, wParam, lParam); - break; + return IntPtr.Zero; // Keyboard events: case WindowMessage.KEYDOWN: @@ -833,7 +833,7 @@ namespace OpenTK.Platform.Windows { if (mouse_capture_count == 0) { - Functions.SetCapture(window.Handle); + Functions.SetCapture(child_window.Handle); } mouse_capture_count++; } -- 2.7.4