diff options
Diffstat (limited to 'gdk/wayland/gdkcursor-wayland.c')
| -rw-r--r-- | gdk/wayland/gdkcursor-wayland.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/gdk/wayland/gdkcursor-wayland.c b/gdk/wayland/gdkcursor-wayland.c index 1df5a02bfb..908f7621fa 100644 --- a/gdk/wayland/gdkcursor-wayland.c +++ b/gdk/wayland/gdkcursor-wayland.c @@ -34,7 +34,7 @@ #include "gdkwayland.h" #include <gdk-pixbuf/gdk-pixbuf.h> -#include <wayland-cursor.h> +#include <cursor/wayland-cursor.h> #define GDK_TYPE_WAYLAND_CURSOR (_gdk_wayland_cursor_get_type ()) #define GDK_WAYLAND_CURSOR(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_WAYLAND_CURSOR, GdkWaylandCursor)) @@ -149,9 +149,8 @@ _gdk_wayland_cursor_update (GdkWaylandDisplay *display_wayland, if (cursor->name == NULL) return FALSE; - theme = _gdk_wayland_display_get_scaled_cursor_theme (display_wayland, - cursor->scale); - c = wl_cursor_theme_get_cursor (theme, cursor->name); + theme = _gdk_wayland_display_get_cursor_theme (display_wayland); + c = wl_cursor_theme_get_cursor (theme, cursor->name, cursor->scale); if (!c) { const char *fallback; @@ -159,9 +158,9 @@ _gdk_wayland_cursor_update (GdkWaylandDisplay *display_wayland, fallback = name_fallback (cursor->name); if (fallback) { - c = wl_cursor_theme_get_cursor (theme, name_fallback (cursor->name)); + c = wl_cursor_theme_get_cursor (theme, fallback, cursor->scale); if (!c) - c = wl_cursor_theme_get_cursor (theme, "left_ptr"); + c = wl_cursor_theme_get_cursor (theme, "left_ptr", cursor->scale); } } @@ -305,12 +304,6 @@ _gdk_wayland_cursor_set_scale (GdkCursor *cursor, GDK_WAYLAND_DISPLAY (gdk_cursor_get_display (cursor)); GdkWaylandCursor *wayland_cursor = GDK_WAYLAND_CURSOR (cursor); - if (scale > GDK_WAYLAND_MAX_THEME_SCALE) - { - g_warning (G_STRLOC ": cursor theme size %u too large", scale); - scale = GDK_WAYLAND_MAX_THEME_SCALE; - } - if (wayland_cursor->scale == scale) return; |