From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 27 Oct 2020 19:43:26 +0000 (+0100)
Subject: patch 8.2.1913: GTK GUI: rounding for the cell height is too strict
X-Git-Tag: v8.2.1913
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=70cf45810cb9be5bd17074f7fb4ee238f2c4d57b;p=vim

patch 8.2.1913: GTK GUI: rounding for the cell height is too strict

Problem:    GTK GUI: rounding for the cell height is too strict.
Solution:   Round up above 15/16 of a pixel. (closes #7203)
---

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 2c5864ed4..1a4ebf9ba 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -4726,9 +4726,10 @@ gui_mch_adjust_charheight(void)
 
     pango_font_metrics_unref(metrics);
 
-    // 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;
+    // Round up when the value is more than about 1/16 of a pixel above a whole
+    // pixel (12.0624 becomes 12, 12.07 becomes 13).  Then add 'linespace'.
+    gui.char_height = (ascent + descent + (PANGO_SCALE * 15) / 16)
+						   / 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 adef583b9..b83bc4811 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1913,
 /**/
     1912,
 /**/