AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 10:50:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'work/zzag/avoid-scaling-cairo-surface-twic3' into 'gtk-3-24'

Browse Source 
wayland: Fix wl_buffer size for custom cursors

See merge request GNOME/gtk!6637
This commit is contained in:
Matthias Clasen 2023-12-19 01:11:15 +00:00
commit 432ed07105
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gdk/wayland/gdkcursor-wayland.c
View File

@ -467,15 +467,24 @@ _gdk_wayland_display_get_cursor_for_surface (GdkDisplay *display,
cursor->surface.hotspot_x = x;
cursor->surface.hotspot_y = y;
cursor->surface.scale = 1;
if (surface)
{
cursor->surface.width = cairo_image_surface_get_width (surface);
cursor->surface.height = cairo_image_surface_get_height (surface);
double sx, sy;
cairo_surface_get_device_scale (surface, &sx, &sy);
cursor->surface.scale = (int)sx;
cursor->surface.width = cairo_image_surface_get_width (surface);
cursor->surface.height = cairo_image_surface_get_height (surface);
while ((cursor->surface.width % cursor->surface.scale != 0) ||
(cursor->surface.height % cursor->surface.scale != 0))
{
g_warning_once (G_STRLOC " cursor image size (%dx%d) not an integer"
"multiple of scale (%d)", cursor->surface.width, cursor->surface.height,
cursor->surface.scale);
cursor->surface.scale--;
}
cursor->surface.hotspot_x *= sx;
cursor->surface.hotspot_y *= sx;
}
@ -483,12 +492,13 @@ _gdk_wayland_display_get_cursor_for_surface (GdkDisplay *display,
{
cursor->surface.width = 1;
cursor->surface.height = 1;
cursor->surface.scale = 1;
}
cursor->surface.cairo_surface =
_gdk_wayland_display_create_shm_surface (display_wayland,
cursor->surface.width,
cursor->surface.height,
cursor->surface.width / cursor->surface.scale,
cursor->surface.height / cursor->surface.scale,
cursor->surface.scale);
buffer = _gdk_wayland_shm_surface_get_wl_buffer (cursor->surface.cairo_surface);