AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-07 01:00:28 +00:00
Code Issues Projects Releases Wiki Activity

GtkStyleProperties: Merge font descriptions on merge()

Browse Source 
This is necessary so incomplete font descriptions are ensured to have
family and size.
This commit is contained in:
Carlos Garnacho 2010-11-03 11:36:18 +01:00
parent af20ba6103
commit fb8de847df
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtkstyleproperties.c
View File

@ -1059,7 +1059,19 @@ gtk_style_properties_merge (GtkStyleProperties *props,
data = &g_array_index (prop_to_merge->values, ValueData, i); data = &g_array_index (prop_to_merge->values, ValueData, i);
value = property_data_get_value (prop, data->state); value = property_data_get_value (prop, data->state);
if (replace || !G_IS_VALUE (value)) if (G_VALUE_TYPE (&data->value) == PANGO_TYPE_FONT_DESCRIPTION &&
G_IS_VALUE (value))
{
PangoFontDescription *font_desc;
PangoFontDescription *font_desc_to_merge;
/* Handle merging of font descriptions */
font_desc = g_value_get_boxed (value);
font_desc_to_merge = g_value_get_boxed (&data->value);
pango_font_description_merge (font_desc, font_desc_to_merge, replace);
}
else if (replace || !G_IS_VALUE (value))
{ {
if (!G_IS_VALUE (value)) if (!G_IS_VALUE (value))
g_value_init (value, G_VALUE_TYPE (&data->value)); g_value_init (value, G_VALUE_TYPE (&data->value));