Browse Source

Disable the in_title_click data & focus_click_pending tests for SDL windows mouse warp, as it seems to lead into issues when regaining focus. Closes #1258.

Lasse Öörni 9 years ago
parent
commit
4d3d2affbb
1 changed files with 7 additions and 3 deletions
  1. 7 3
      Source/ThirdParty/SDL/src/video/windows/SDL_windowsmouse.c

+ 7 - 3
Source/ThirdParty/SDL/src/video/windows/SDL_windowsmouse.c

@@ -18,6 +18,9 @@
      misrepresented as being the original software.
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
   3. This notice may not be removed or altered from any source distribution.
 */
 */
+
+// Modified by Lasse Oorni for Urho3D
+
 #include "../../SDL_internal.h"
 #include "../../SDL_internal.h"
 
 
 #if SDL_VIDEO_DRIVER_WINDOWS
 #if SDL_VIDEO_DRIVER_WINDOWS
@@ -226,9 +229,10 @@ WIN_WarpMouse(SDL_Window * window, int x, int y)
     POINT pt;
     POINT pt;
 
 
     /* Don't warp the mouse while we're doing a modal interaction */
     /* Don't warp the mouse while we're doing a modal interaction */
-    if (data->in_title_click || data->focus_click_pending) {
-        return;
-    }
+    // Urho3D: disable check as warping should already be used responsibly and a possible bug #1258 results from this from SDL 2.0.4 onward
+    //if (data->in_title_click || data->focus_click_pending) {
+    //    return;
+    //}
 
 
     pt.x = x;
     pt.x = x;
     pt.y = y;
     pt.y = y;