(w32font_open_internal): Set max_bounds.descent in

compatibility struct, for better underline positioning.

diff --git a/src/ChangeLog b/src/ChangeLog
index 756fa6f47ee8e0cb4c954e01a1d3d2f1bd42e3e3..7aa8c857523cfd6549bb9b5472ddfc0351b53909 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-14  Jason Rumney  <jasonr@gnu.org>
+
+       * w32font.c (w32font_open_internal): Set max_bounds.descent in
+       compatibility struct, for better underline positioning.
+
 2008-04-13  David Hansen  <david.hansen@gmx.net>  (tiny change)
 
        * dbusbind.c (dbus-get-unique-name): Remove extra copying of name

diff --git a/src/w32font.c b/src/w32font.c
index 6bd0376810ca3dccc8edff1aaff5233ee6b55c2d..ed53ff9c4b1993ccd774e5376a769ae5aa3a4a68 100644 (file)
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -877,6 +877,11 @@ w32font_open_internal (f, font_entity, pixel_size, w32_font)
   font->descent = w32_font->metrics.tmDescent;
   font->scalable = w32_font->metrics.tmPitchAndFamily & TMPF_VECTOR;
 
+  /* max_descent is used for underlining in w32term.c.  Hopefully this
+     is temporary, as we'll want to get rid of the old compatibility
+     stuff later.  */
+  compat_w32_font->max_bounds.descent = font->descent;
+
   /* Set global flag fonts_changed_p to non-zero if the font loaded
      has a character with a smaller width than any other character
      before, or if the font loaded has a smaller height than any other