Merge branch 'no-cursor-viewport' into 'main'

wayland: No viewporter for cursors

See merge request GNOME/gtk!7531
This commit is contained in:
Matthias Clasen 2024-07-31 20:23:34 +00:00
commit 96422fcf52

View File

@ -265,13 +265,13 @@ gdk_wayland_device_update_surface_cursor (GdkDevice *device)
guint next_image_index, next_image_delay; guint next_image_index, next_image_delay;
gboolean retval = G_SOURCE_REMOVE; gboolean retval = G_SOURCE_REMOVE;
GdkWaylandTabletData *tablet; GdkWaylandTabletData *tablet;
gboolean use_viewport; gboolean use_viewport = FALSE;
tablet = gdk_wayland_seat_find_tablet (seat, device); tablet = gdk_wayland_seat_find_tablet (seat, device);
use_viewport = pointer->pointer_surface_viewport != NULL; if (pointer->pointer_surface_viewport &&
if (g_getenv ("NO_POINTER_VIEWPORT")) g_getenv ("USE_POINTER_VIEWPORT"))
use_viewport = FALSE; use_viewport = TRUE;
if (pointer->cursor) if (pointer->cursor)
{ {