From 5cd1cb9ff9d04979ff4cbc36ca8416d83364505d Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 31 May 2020 13:53:04 +0200 Subject: patch 8.2.0857: GTK cell height can be a pixel too much Problem: GTK cell height can be a pixel too much. Solution: Subtract 3 instead of 1 when rounding. (closes #6168) --- src/gui_gtk_x11.c | 3 ++- src/version.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index 96e70a88e..a5af3fa21 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -4711,7 +4711,8 @@ gui_mch_adjust_charheight(void) pango_font_metrics_unref(metrics); - gui.char_height = (ascent + descent + PANGO_SCALE - 1) / PANGO_SCALE + // Round up, but not when the value is very close (e.g. 15.0009). + gui.char_height = (ascent + descent + PANGO_SCALE - 3) / PANGO_SCALE + p_linespace; // LINTED: avoid warning: bitwise operation on signed value gui.char_ascent = PANGO_PIXELS(ascent + p_linespace * PANGO_SCALE / 2); diff --git a/src/version.c b/src/version.c index c4728196e..5bd8609c9 100644 --- a/src/version.c +++ b/src/version.c @@ -746,6 +746,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 857, /**/ 856, /**/ -- cgit v1.2.1