TeamHepta/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-05-05 07:32:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Don't fail to retrieve a system cursor if no window is focused

Browse Source 
Doing this can leave the cursor data in a weird, corrupt state.

(cherry picked from commit 5617ce277d)
(cherry picked from commit 5d1ca1c8c7)
This commit is contained in:
Frank Praznik
2024-07-27 20:22:10 -04:00
parent 0406d1c316
commit 881c4cb49e
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/video/wayland/SDL_waylandmouse.c
View File

@@ -192,7 +192,6 @@ static SDL_bool wayland_get_system_cursor(SDL_VideoData *vdata, Wayland_CursorDa
int size = 0;
SDL_Window *focus;
SDL_WindowData *focusdata;
int i;
/*
@@ -216,16 +215,17 @@ static SDL_bool wayland_get_system_cursor(SDL_VideoData *vdata, Wayland_CursorDa
}
/* First, find the appropriate theme based on the current scale... */
focus = SDL_GetMouse()->focus;
if (!focus) {
/* Nothing to see here, bail. */
return SDL_FALSE;
}
focusdata = focus->driverdata;
if (focus) {
SDL_WindowData *focusdata = (SDL_WindowData*)focus->driverdata;
/* Cursors use integer scaling. */
*scale = SDL_ceilf(focusdata->scale_factor);
size *= *scale;
for (i = 0; i < vdata->num_cursor_themes; i += 1) {
/* Cursors use integer scaling. */
*scale = SDL_ceilf(focusdata->scale_factor);
} else {
*scale = 1.0f;
}
size *= (int)*scale;
for (i = 0; i < vdata->num_cursor_themes; ++i) {
if (vdata->cursor_themes[i].size == size) {
theme = vdata->cursor_themes[i].theme;
break;