callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wayland: Respect cursor size setting

Browse Source 
Respect the cursor size setting when loading the cursor theme.
This commit is contained in:
Matthias Clasen
2013-03-22 19:32:39 -04:00
parent 3278fb9990
commit 8caf1ae7fd
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gdk/wayland/gdkdisplay-wayland.c
View File

@ -565,15 +565,20 @@ gdk_wayland_display_init (GdkWaylandDisplay *display)
static void static void
_gdk_wayland_display_load_cursor_theme (GdkWaylandDisplay *wayland_display) _gdk_wayland_display_load_cursor_theme (GdkWaylandDisplay *wayland_display)
{ {
guint w, h; guint size;
const gchar *theme_name; const gchar *theme_name;
GValue v = G_VALUE_INIT; GValue v = G_VALUE_INIT;
g_assert (wayland_display); g_assert (wayland_display);
g_assert (wayland_display->shm); g_assert (wayland_display->shm);
_gdk_wayland_display_get_default_cursor_size (GDK_DISPLAY (wayland_display), g_value_init (&v, G_TYPE_INT);
&w, &h); 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); g_value_init (&v, G_TYPE_STRING);
if (gdk_setting_get ("gtk-cursor-theme-name", &v)) if (gdk_setting_get ("gtk-cursor-theme-name", &v))
theme_name = g_value_get_string (&v); theme_name = g_value_get_string (&v);
@ -581,7 +586,7 @@ _gdk_wayland_display_load_cursor_theme (GdkWaylandDisplay *wayland_display)
theme_name = "default"; theme_name = "default";
wayland_display->cursor_theme = wl_cursor_theme_load (theme_name, wayland_display->cursor_theme = wl_cursor_theme_load (theme_name,
w, size,
wayland_display->shm); wayland_display->shm);
g_value_unset (&v); g_value_unset (&v);
} }