From 597634cbfbe4bd6020dc4aefa89e0f0ae7317244 Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Wed, 23 Jul 2008 13:20:58 +0000 Subject: [PATCH] (w32_enumfont_pattern_entity): Return height consistent with opened font. --- src/ChangeLog | 5 +++++ src/w32font.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index be233c512f5..019c5f05a23 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2008-07-23 Jason Rumney + + * w32font.c (w32_enumfont_pattern_entity): Return height consistent + with opened font. + 2008-07-23 Dan Nicolaescu * s/usg5-4.h (ADDR_CORRECT): Remove, unused. diff --git a/src/w32font.c b/src/w32font.c index 7be72bb49a8..45d5742f4aa 100644 --- a/src/w32font.c +++ b/src/w32font.c @@ -1032,7 +1032,9 @@ w32_enumfont_pattern_entity (frame, logical_font, physical_font, FONT_SET_STYLE (entity, FONT_WIDTH_INDEX, make_number (100)); if (font_type & RASTER_FONTTYPE) - ASET (entity, FONT_SIZE_INDEX, make_number (physical_font->ntmTm.tmHeight)); + ASET (entity, FONT_SIZE_INDEX, + make_number (physical_font->ntmTm.tmHeight + + physical_font->ntmTm.tmExternalLeading)); else ASET (entity, FONT_SIZE_INDEX, make_number (0)); -- 2.39.2