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)

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 96e70a88e57763db1e23be905b2dd43928106b81..a5af3fa21cbbabdfab6d19f07ba0bf6e3dd76191 100644 (file)
--- 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 c4728196e4c68fadb44ae1a033401ba8c1fa7920..5bd8609c9acdf23966d57ab97e720e99219a4538 100644 (file)
--- 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,
 /**/