Turn off relative mouse before window checks as well

This commit is contained in:
FriendlyAI authored and Sam Lantinga committed 2022-04-26 10:07:26 -07:00
1 parent e2d268a399
commit 795744fc75
1 file changed
+6 -12
+6 -12
View File
@@ -263,9 +263,12 @@ Cocoa_SetRelativeMouseMode(SDL_bool enabled)
if (enabled) { if (enabled) {
DLog("Turning on."); DLog("Turning on.");
result = CGAssociateMouseAndMouseCursorPosition(NO); result = CGAssociateMouseAndMouseCursorPosition(NO);
if (result != kCGErrorSuccess) { } else {
return SDL_SetError("CGAssociateMouseAndMouseCursorPosition() failed"); DLog("Turning off.");
} result = CGAssociateMouseAndMouseCursorPosition(YES);
}
if (result != kCGErrorSuccess) {
return SDL_SetError("CGAssociateMouseAndMouseCursorPosition() failed");
} }
/* We will re-apply the non-relative mode when the window gets focus, if it /* We will re-apply the non-relative mode when the window gets focus, if it
@@ -284,15 +287,6 @@ Cocoa_SetRelativeMouseMode(SDL_bool enabled)
return 0; return 0;
} }
if (!enabled) {
DLog("Turning off.");
result = CGAssociateMouseAndMouseCursorPosition(YES);
if (result != kCGErrorSuccess) {
return SDL_SetError("CGAssociateMouseAndMouseCursorPosition() failed");
}
}
/* The hide/unhide calls are redundant most of the time, but they fix /* The hide/unhide calls are redundant most of the time, but they fix
* https://bugzilla.libsdl.org/show_bug.cgi?id=2550 * https://bugzilla.libsdl.org/show_bug.cgi?id=2550
*/ */