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

Improve the font options support

Browse Source 
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
This commit is contained in:
Matthias Clasen 2015-07-01 19:15:56 -07:00
parent e9b847736c
commit a0e8d8db0b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtkwidget.c
View File

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