gtk+ r20406 - in trunk: . gtk

[behdad svn gnome org]

Author: behdad
Date: Mon Jun 16 18:53:17 2008
New Revision: 20406
URL: http://svn.gnome.org/viewvc/gtk+?rev=20406&view=rev

Log:
2008-06-16  Behdad Esfahbod  <behdad gnome org>

        Bug 538182 â pango_cairo_context_update_layout is not noop after
        gtk_widget_create_pango_layout

        * gtk/gtksettings.c (settings_update_font_options): Make sure all
        font option fields are set to non-DEFAULT values.



Modified:
   trunk/ChangeLog
   trunk/gtk/gtksettings.c

Modified: trunk/gtk/gtksettings.c
==============================================================================
--- trunk/gtk/gtksettings.c	(original)
+++ trunk/gtk/gtksettings.c	Mon Jun 16 18:53:17 2008
@@ -1905,9 +1905,9 @@
 {
   gint hinting;
   gchar *hint_style_str;
-  cairo_hint_style_t hint_style = CAIRO_HINT_STYLE_DEFAULT;
+  cairo_hint_style_t hint_style = CAIRO_HINT_STYLE_NONE;
   gint antialias;
-  cairo_antialias_t antialias_mode = CAIRO_ANTIALIAS_DEFAULT;
+  cairo_antialias_t antialias_mode = CAIRO_ANTIALIAS_GRAY;
   gchar *rgba_str;
   cairo_subpixel_order_t subpixel_order = CAIRO_SUBPIXEL_ORDER_DEFAULT;
   cairo_font_options_t *options;
@@ -1920,6 +1920,8 @@
 		NULL);
 
   options = cairo_font_options_create ();
+
+  cairo_font_options_set_hint_metrics (options, CAIRO_HINT_METRICS_ON);
   
   if (hinting >= 0 && !hinting)
     {