diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/w32term.c | 7 | ||||
| -rw-r--r-- | src/xterm.c | 9 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/w32term.c b/src/w32term.c index 6f74972df91..3b64348a6a3 100644 --- a/src/w32term.c +++ b/src/w32term.c | |||
| @@ -1925,9 +1925,10 @@ x_produce_stretch_glyph (it) | |||
| 1925 | */ | 1925 | */ |
| 1926 | 1926 | ||
| 1927 | #define VCENTER_BASELINE_OFFSET(FONT, F) \ | 1927 | #define VCENTER_BASELINE_OFFSET(FONT, F) \ |
| 1928 | (FONT_DESCENT (FONT) \ | 1928 | (FONT_DESCENT (FONT) \ |
| 1929 | + (FRAME_LINE_HEIGHT ((F)) + 1 - FONT_HEIGHT ((FONT))) / 2 \ | 1929 | + (FRAME_LINE_HEIGHT ((F)) - FONT_HEIGHT ((FONT)) \ |
| 1930 | - (FONT_DESCENT (FRAME_FONT (F)) - FRAME_BASELINE_OFFSET (F))) | 1930 | + (FRAME_LINE_HEIGHT ((F)) > FONT_HEIGHT ((FONT)))) / 2 \ |
| 1931 | - (FONT_DESCENT (FRAME_FONT (F)) - FRAME_BASELINE_OFFSET (F))) | ||
| 1931 | 1932 | ||
| 1932 | /* Produce glyphs/get display metrics for the display element IT is | 1933 | /* Produce glyphs/get display metrics for the display element IT is |
| 1933 | loaded with. See the description of struct display_iterator in | 1934 | loaded with. See the description of struct display_iterator in |
diff --git a/src/xterm.c b/src/xterm.c index 838e6472c7f..0736459cf30 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -1775,10 +1775,11 @@ x_produce_stretch_glyph (it) | |||
| 1775 | F_HEIGHT = FRAME_LINE_HEIGHT (F) | 1775 | F_HEIGHT = FRAME_LINE_HEIGHT (F) |
| 1776 | */ | 1776 | */ |
| 1777 | 1777 | ||
| 1778 | #define VCENTER_BASELINE_OFFSET(FONT, F) \ | 1778 | #define VCENTER_BASELINE_OFFSET(FONT, F) \ |
| 1779 | ((FONT)->descent \ | 1779 | ((FONT)->descent \ |
| 1780 | + (FRAME_LINE_HEIGHT ((F)) + 1 - FONT_HEIGHT ((FONT))) / 2 \ | 1780 | + (FRAME_LINE_HEIGHT ((F)) - FONT_HEIGHT ((FONT)) \ |
| 1781 | - ((F)->output_data.x->font->descent - (F)->output_data.x->baseline_offset)) | 1781 | + (FRAME_LINE_HEIGHT ((F)) > FONT_HEIGHT ((FONT)))) / 2 \ |
| 1782 | - ((F)->output_data.x->font->descent - (F)->output_data.x->baseline_offset)) | ||
| 1782 | 1783 | ||
| 1783 | /* Produce glyphs/get display metrics for the display element IT is | 1784 | /* Produce glyphs/get display metrics for the display element IT is |
| 1784 | loaded with. See the description of struct display_iterator in | 1785 | loaded with. See the description of struct display_iterator in |