Commit a0e8d8db authored by Matthias Clasen's avatar Matthias Clasen

Improve the font options support

Instead of just overwriting the default options, merge the per-widget
font options with the defaults.

https://bugzilla.gnome.org/show_bug.cgi?id=751811
parent e9b84773
......@@ -10338,10 +10338,14 @@ update_pango_context (GtkWidget *widget,
screen = gtk_widget_get_screen_unchecked (widget);
if (widget->priv->font_options)
{
pango_cairo_context_set_font_options (context,
widget->priv->font_options);
cairo_font_options_t *options;
options = cairo_font_options_copy (gdk_screen_get_font_options (screen));
cairo_font_options_merge (options, widget->priv->font_options);
pango_cairo_context_set_font_options (context, options);
cairo_font_options_destroy (options);
}
else if (screen)
else
{
pango_cairo_context_set_font_options (context,
gdk_screen_get_font_options (screen));
......
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