mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-06 08:40:08 +00:00
styleproperties: don't force replacing the font description
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:
parent
b04f4c536a
commit
89c1d93b68
@ -1243,7 +1243,7 @@ gtk_style_properties_merge (GtkStyleProperties *props,
|
||||
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);
|
||||
pango_font_description_merge (font_desc, font_desc_to_merge, FALSE);
|
||||
}
|
||||
else if (G_VALUE_TYPE (&data->value) == G_TYPE_PTR_ARRAY &&
|
||||
G_IS_VALUE (value))
|
||||
|
Loading…
Reference in New Issue
Block a user