Mirrors_Framework/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-05-31 14:29:14 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Leave mouse relative mode when losing focus

Browse Source 
Fixes https://github.com/libsdl-org/SDL/issues/7892
This commit is contained in:
Sam Lantinga
2024-12-23 15:22:50 -08:00
parent 62124e2c28
commit 49610fd1e8
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/events/SDL_keyboard.c
+14
View File
@@ -322,6 +322,7 @@ bool SDL_SetKeyboardFocus(SDL_Window *window)
{ {
SDL_VideoDevice *video = SDL_GetVideoDevice(); SDL_VideoDevice *video = SDL_GetVideoDevice();
SDL_Keyboard *keyboard = &SDL_keyboard; SDL_Keyboard *keyboard = &SDL_keyboard;
SDL_Mouse *mouse = SDL_GetMouse();
if (window) { if (window) {
if (!SDL_ObjectValid(window, SDL_OBJECT_TYPE_WINDOW) || window->is_destroying) { if (!SDL_ObjectValid(window, SDL_OBJECT_TYPE_WINDOW) || window->is_destroying) {
@@ -332,6 +333,19 @@ bool SDL_SetKeyboardFocus(SDL_Window *window)
if (keyboard->focus && !window) { if (keyboard->focus && !window) {
// We won't get anymore keyboard messages, so reset keyboard state // We won't get anymore keyboard messages, so reset keyboard state
SDL_ResetKeyboard(); SDL_ResetKeyboard();
// Also leave mouse relative mode
if (mouse->relative_mode) {
SDL_SetRelativeMouseMode(false);
SDL_Window *focus = keyboard->focus;
if ((focus->flags & SDL_WINDOW_MINIMIZED) != 0) {
// We can't warp the mouse within minimized windows, so manually restore the position
float x = focus->x + mouse->x;
float y = focus->y + mouse->y;
SDL_WarpMouseGlobal(x, y);
}
}
} }
// See if the current window has lost focus // See if the current window has lost focus