From 8caf1ae7fd34f7260ab3e70cdb90f73c5492db38 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 22 Mar 2013 19:32:39 -0400 Subject: [PATCH] wayland: Respect cursor size setting Respect the cursor size setting when loading the cursor theme. --- gdk/wayland/gdkdisplay-wayland.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c index 146b499a1c..c3442f0361 100644 --- a/gdk/wayland/gdkdisplay-wayland.c +++ b/gdk/wayland/gdkdisplay-wayland.c @@ -565,15 +565,20 @@ gdk_wayland_display_init (GdkWaylandDisplay *display) static void _gdk_wayland_display_load_cursor_theme (GdkWaylandDisplay *wayland_display) { - guint w, h; + guint size; const gchar *theme_name; GValue v = G_VALUE_INIT; g_assert (wayland_display); g_assert (wayland_display->shm); - _gdk_wayland_display_get_default_cursor_size (GDK_DISPLAY (wayland_display), - &w, &h); + g_value_init (&v, G_TYPE_INT); + if (gdk_setting_get ("gtk-cursor-theme-size", &v)) + size = g_value_get_int (&v); + else + size = 32; + g_value_unset (&v); + g_value_init (&v, G_TYPE_STRING); if (gdk_setting_get ("gtk-cursor-theme-name", &v)) theme_name = g_value_get_string (&v); @@ -581,7 +586,7 @@ _gdk_wayland_display_load_cursor_theme (GdkWaylandDisplay *wayland_display) theme_name = "default"; wayland_display->cursor_theme = wl_cursor_theme_load (theme_name, - w, + size, wayland_display->shm); g_value_unset (&v); }