encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only warp the mouse to set focus if we're definitely going into relative mode

This commit is contained in:
Sam Lantinga 2019-06-18 14:24:26 -07:00
parent 14e8b93e37
commit 8ab907baa6
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/events/SDL_mouse.c
View File

@ -785,14 +785,6 @@ SDL_SetRelativeMouseMode(SDL_bool enabled)
return 0; return 0;
} }
if (enabled && focusWindow) {
/* Center it in the focused window to prevent clicks from going through
* to background windows.
*/
SDL_SetMouseFocus(focusWindow);
SDL_WarpMouseInWindow(focusWindow, focusWindow->w/2, focusWindow->h/2);
}
/* Set the relative mode */ /* Set the relative mode */
if (!enabled && mouse->relative_mode_warp) { if (!enabled && mouse->relative_mode_warp) {
mouse->relative_mode_warp = SDL_FALSE; mouse->relative_mode_warp = SDL_FALSE;
@ -811,6 +803,14 @@ SDL_SetRelativeMouseMode(SDL_bool enabled)
mouse->scale_accum_x = 0.0f; mouse->scale_accum_x = 0.0f;
mouse->scale_accum_y = 0.0f; mouse->scale_accum_y = 0.0f;
if (enabled && focusWindow) {
/* Center it in the focused window to prevent clicks from going through
* to background windows.
*/
SDL_SetMouseFocus(focusWindow);
SDL_WarpMouseInWindow(focusWindow, focusWindow->w/2, focusWindow->h/2);
}
if (mouse->focus) { if (mouse->focus) {
SDL_UpdateWindowGrab(mouse->focus); SDL_UpdateWindowGrab(mouse->focus);