diff options
| author | Jason Rumney <jasonr@gnu.org> | 2008-11-26 13:37:17 +0000 |
|---|---|---|
| committer | Jason Rumney <jasonr@gnu.org> | 2008-11-26 13:37:17 +0000 |
| commit | 9196133b4b3480a58f27c043805443a99ad825e1 (patch) | |
| tree | 5ae5fd7fa62760dbbbe2bf291c51790c080208dd /src/w32font.c | |
| parent | 0ec6a7e50154db4797a86745ce31831bc2018b2d (diff) | |
| download | emacs-9196133b4b3480a58f27c043805443a99ad825e1.tar.gz | |
(w32font_open_internal): Don't include external leading in font height.
Diffstat (limited to 'src/w32font.c')
| -rw-r--r-- | src/w32font.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/w32font.c b/src/w32font.c index 63cd5c2de47..40d4bd64049 100644 --- a/src/w32font.c +++ b/src/w32font.c @@ -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) { |