AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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".
This commit is contained in:
Matthias Clasen 2006-01-25 15:41:40 +00:00 committed by Matthias Clasen
parent 58e77fe25b
commit 2ec7ee28b8
4 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
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.

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,11 @@
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.

3
gdk/x11/gdkcursor-x11.c
View File

@ -452,7 +452,7 @@ update_cursor (gpointer key,
* @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
* @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,6 +494,7 @@ gdk_x11_display_set_cursor_theme (GdkDisplay *display,
theme_serial++;
XcursorSetTheme (xdisplay, theme);
if (size > 0)
XcursorSetDefaultSize (xdisplay, size);
g_hash_table_foreach (display_x11->xid_ht, update_cursor, NULL);

6
gtk/gtksettings.c
View File

@ -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);