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

styleproperties: don't force replacing the font description

Browse Source 
Otherwise custom fonts will always get overridden by the default stored
in GtkSettings when merging them.

https://bugzilla.gnome.org/show_bug.cgi?id=644975
This commit is contained in:
Cosimo Cecchi 2011-03-17 14:31:57 -04:00
parent b04f4c536a
commit 89c1d93b68
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtkstyleproperties.c
View File

@ -1243,7 +1243,7 @@ gtk_style_properties_merge (GtkStyleProperties *props,
font_desc = g_value_get_boxed (value); font_desc = g_value_get_boxed (value);
font_desc_to_merge = g_value_get_boxed (&data->value); font_desc_to_merge = g_value_get_boxed (&data->value);
pango_font_description_merge (font_desc, font_desc_to_merge, replace); pango_font_description_merge (font_desc, font_desc_to_merge, FALSE);
} }
else if (G_VALUE_TYPE (&data->value) == G_TYPE_PTR_ARRAY && else if (G_VALUE_TYPE (&data->value) == G_TYPE_PTR_ARRAY &&
G_IS_VALUE (value)) G_IS_VALUE (value))