mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-06 03:18:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

streamline boolean logic

Browse Source
This commit is contained in:
expikr
2025-04-27 13:31:50 +08:00
committed by Sam Lantinga
parent 441e7e488f
commit c4d5cc358f
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/events/SDL_mouse.c
View File

@@ -1607,7 +1607,7 @@ bool SDL_SetCursor(SDL_Cursor *cursor)
{ {
SDL_Mouse *mouse = SDL_GetMouse(); SDL_Mouse *mouse = SDL_GetMouse();
// Return immediately if setting the cursor to the currently set one (fixes #7151) // already on this cursor, no further action required
if (cursor == mouse->cur_cursor) { if (cursor == mouse->cur_cursor) {
return true; return true;
} }
@@ -1627,23 +1627,20 @@ bool SDL_SetCursor(SDL_Cursor *cursor)
} }
} }
mouse->cur_cursor = cursor; mouse->cur_cursor = cursor;
} else { } else if (mouse->focus) {
if (mouse->focus) {
cursor = mouse->cur_cursor; cursor = mouse->cur_cursor;
} else { } else {
cursor = mouse->def_cursor; cursor = mouse->def_cursor;
} }
if (mouse->focus && (!mouse->cursor_visible || (mouse->relative_mode && mouse->relative_mode_hide_cursor))) {
cursor = NULL;
} }
if (cursor && (!mouse->focus || (mouse->cursor_visible && (!mouse->relative_mode || !mouse->relative_mode_hide_cursor)))) {
if (mouse->ShowCursor) { if (mouse->ShowCursor) {
mouse->ShowCursor(cursor); mouse->ShowCursor(cursor);
} }
} else {
if (mouse->ShowCursor) {
mouse->ShowCursor(NULL);
}
}
return true; return true;
} }