wayland: Don't fail to retrieve a system cursor if no window is focused
Doing this can leave the cursor data in a weird, corrupt state. (cherry picked from commit5617ce277d) (cherry picked from commit5d1ca1c8c7)
This commit is contained in:
1 file changed
+10
-10
@@ -192,7 +192,6 @@ static SDL_bool wayland_get_system_cursor(SDL_VideoData *vdata, Wayland_CursorDa
|
|||||||
int size = 0;
|
int size = 0;
|
||||||
|
|
||||||
SDL_Window *focus;
|
SDL_Window *focus;
|
||||||
SDL_WindowData *focusdata;
|
|
||||||
int i;
|
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... */
|
/* First, find the appropriate theme based on the current scale... */
|
||||||
focus = SDL_GetMouse()->focus;
|
focus = SDL_GetMouse()->focus;
|
||||||
if (!focus) {
|
if (focus) {
|
||||||
/* Nothing to see here, bail. */
|
SDL_WindowData *focusdata = (SDL_WindowData*)focus->driverdata;
|
||||||
return SDL_FALSE;
|
|
||||||
}
|
|
||||||
focusdata = focus->driverdata;
|
|
||||||
|
|
||||||
/* Cursors use integer scaling. */
|
/* Cursors use integer scaling. */
|
||||||
*scale = SDL_ceilf(focusdata->scale_factor);
|
*scale = SDL_ceilf(focusdata->scale_factor);
|
||||||
size *= *scale;
|
} else {
|
||||||
for (i = 0; i < vdata->num_cursor_themes; i += 1) {
|
*scale = 1.0f;
|
||||||
|
}
|
||||||
|
|
||||||
|
size *= (int)*scale;
|
||||||
|
for (i = 0; i < vdata->num_cursor_themes; ++i) {
|
||||||
if (vdata->cursor_themes[i].size == size) {
|
if (vdata->cursor_themes[i].size == size) {
|
||||||
theme = vdata->cursor_themes[i].theme;
|
theme = vdata->cursor_themes[i].theme;
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in new issue
Block a user