To: vim_dev@googlegroups.com Subject: Patch 8.2.1913 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1913 Problem: GTK GUI: rounding for the cell height is too strict. Solution: Round up above 15/16 of a pixel. (closes #7203) Files: src/gui_gtk_x11.c *** ../vim-8.2.1912/src/gui_gtk_x11.c 2020-10-24 20:49:37.498683038 +0200 --- src/gui_gtk_x11.c 2020-10-27 20:41:22.272173632 +0100 *************** *** 4726,4734 **** 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; // LINTED: avoid warning: bitwise operation on signed value gui.char_ascent = PANGO_PIXELS(ascent + p_linespace * PANGO_SCALE / 2); --- 4726,4735 ---- pango_font_metrics_unref(metrics); ! // 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); *** ../vim-8.2.1912/src/version.c 2020-10-27 19:59:06.762494592 +0100 --- src/version.c 2020-10-27 20:43:01.631917975 +0100 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 1913, /**/ -- Amazing but true: If all the salmon caught in Canada in one year were laid end to end across the Sahara Desert, the smell would be absolutely awful. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///