Commit 9196133b authored by Jason Rumney's avatar Jason Rumney
Browse files

(w32font_open_internal): Don't include external leading in font height.

parent 0ec6a7e5
2008-11-26 Jason Rumney <jasonr@gnu.org>
* w32font.c (w32font_open_internal): Don't include external
leading in font height.
2008-11-26 Glenn Morris <rgm@gnu.org>
* xfaces.c (Fx_font_family_list): Replace lisp/term/pc-win.el
......
......@@ -843,8 +843,12 @@ w32font_open_internal (f, font_entity, pixel_size, font_object)
}
font->max_width = w32_font->metrics.tmMaxCharWidth;
/* Parts of Emacs display assume that height = ascent + descent...
so height is defined later, after ascent and descent.
font->height = w32_font->metrics.tmHeight
+ w32_font->metrics.tmExternalLeading;
*/
font->space_width = font->average_width = w32_font->metrics.tmAveCharWidth;
font->vertical_centering = 0;
......@@ -876,6 +880,7 @@ w32font_open_internal (f, font_entity, pixel_size, font_object)
font->min_width = font->space_width;
font->ascent = w32_font->metrics.tmAscent;
font->descent = w32_font->metrics.tmDescent;
font->height = font->ascent + font->descent;
if (metrics)
{
......
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