Commit 2ec7ee28 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen
Browse files

Only set the cursor size if it is != 0.

2006-01-25  Matthias Clasen  <mclasen@redhat.com>

	* gdk/x11/gdkcursor-x11.c (gdk_x11_display_set_cursor_theme): Only
	set the cursor size if it is != 0.

	* gtk/gtksettings.c (gtk_settings_class_init): Change the default value
	of gtk-cursor-theme-size to 0, meaning "use default".
parent 58e77fe2
2006-01-25 Matthias Clasen <mclasen@redhat.com>
* gdk/x11/gdkcursor-x11.c (gdk_x11_display_set_cursor_theme): Only
set the cursor size if it is != 0.
* gtk/gtksettings.c (gtk_settings_class_init): Change the default value
of gtk-cursor-theme-size to 0, meaning "use default".
2006-01-24 Kristian Rietveld <kris@gtk.org>
#322591, Jonathan Blandford.
......
2006-01-25 Matthias Clasen <mclasen@redhat.com>
* gdk/x11/gdkcursor-x11.c (gdk_x11_display_set_cursor_theme): Only
set the cursor size if it is != 0.
* gtk/gtksettings.c (gtk_settings_class_init): Change the default value
of gtk-cursor-theme-size to 0, meaning "use default".
2006-01-24 Kristian Rietveld <kris@gtk.org>
#322591, Jonathan Blandford.
......
......@@ -451,8 +451,8 @@ update_cursor (gpointer key,
* gdk_x11_display_set_cursor_theme:
* @display: a #GdkDisplay
* @theme: the name of the cursor theme to use, or %NULL to unset
* a previously set value
* @size: the cursor size to use
* a previously set value
* @size: the cursor size to use, or 0 to keep the previous size
*
* Sets the cursor theme from which the images for cursor
* should be taken.
......@@ -494,7 +494,8 @@ gdk_x11_display_set_cursor_theme (GdkDisplay *display,
theme_serial++;
XcursorSetTheme (xdisplay, theme);
XcursorSetDefaultSize (xdisplay, size);
if (size > 0)
XcursorSetDefaultSize (xdisplay, size);
g_hash_table_foreach (display_x11->xid_ht, update_cursor, NULL);
}
......
......@@ -387,7 +387,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
result = settings_install_property_parser (class,
g_param_spec_string ("gtk-cursor-theme-name",
P_("Cursor theme name"),
P_("Name of the cursor theme to use"),
P_("Name of the cursor theme to use, or NULL to use the default theme"),
NULL,
GTK_PARAM_READWRITE),
NULL);
......@@ -396,8 +396,8 @@ gtk_settings_class_init (GtkSettingsClass *class)
result = settings_install_property_parser (class,
g_param_spec_int ("gtk-cursor-theme-size",
P_("Cursor theme size"),
P_("Size to use for cursors"),
0, 128, 24,
P_("Size to use for cursors, or 0 to use the default size"),
0, 128, 0,
GTK_PARAM_READWRITE),
NULL);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment