Mirror of the Vim source from https://github.com/vim/vim
修订版 | 28001013f467370c5d2c0ca652da52cec3982371 (tree) |
---|---|
时间 | 2020-10-28 04:45:03 |
作者 | Bram Moolenaar <Bram@vim....> |
Commiter | Bram Moolenaar |
patch 8.2.1913: GTK GUI: rounding for the cell height is too strict
Commit: https://github.com/vim/vim/commit/70cf45810cb9be5bd17074f7fb4ee238f2c4d57b
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Oct 27 20:43:26 2020 +0100
@@ -4726,9 +4726,10 @@ | ||
4726 | 4726 | |
4727 | 4727 | pango_font_metrics_unref(metrics); |
4728 | 4728 | |
4729 | - // Round up, but not when the value is very close (e.g. 15.0009). | |
4730 | - gui.char_height = (ascent + descent + PANGO_SCALE - 3) / PANGO_SCALE | |
4731 | - + p_linespace; | |
4729 | + // Round up when the value is more than about 1/16 of a pixel above a whole | |
4730 | + // pixel (12.0624 becomes 12, 12.07 becomes 13). Then add 'linespace'. | |
4731 | + gui.char_height = (ascent + descent + (PANGO_SCALE * 15) / 16) | |
4732 | + / PANGO_SCALE + p_linespace; | |
4732 | 4733 | // LINTED: avoid warning: bitwise operation on signed value |
4733 | 4734 | gui.char_ascent = PANGO_PIXELS(ascent + p_linespace * PANGO_SCALE / 2); |
4734 | 4735 |
@@ -751,6 +751,8 @@ | ||
751 | 751 | static int included_patches[] = |
752 | 752 | { /* Add new patch number below this line */ |
753 | 753 | /**/ |
754 | + 1913, | |
755 | +/**/ | |
754 | 756 | 1912, |
755 | 757 | /**/ |
756 | 758 | 1911, |