KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'cell_height_width_off_by_one' of https://github.com/Luflosi/kitty

Browse Source
This commit is contained in:
Kovid Goyal 2019-02-25 21:19:22 +05:30
commit 61a9f7baae
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kitty/fonts.c
View File

@ -398,9 +398,9 @@ calc_cell_metrics(FontGroup *fg) {
if (OPT(adjust_line_height_frac) != 0.f) ch *= OPT(adjust_line_height_frac); if (OPT(adjust_line_height_frac) != 0.f) ch *= OPT(adjust_line_height_frac);
if (OPT(adjust_column_width_px != 0)) cw += OPT(adjust_column_width_px); if (OPT(adjust_column_width_px != 0)) cw += OPT(adjust_column_width_px);
if (OPT(adjust_column_width_frac) != 0.f) cw *= OPT(adjust_column_width_frac); if (OPT(adjust_column_width_frac) != 0.f) cw *= OPT(adjust_column_width_frac);
if (cw >= 2 && cw < 1000) cell_width = cw; if (cw >= 2 && cw <= 1000) cell_width = cw;
else log_error("Cell width invalid after adjustment, ignoring adjust_column_width"); else log_error("Cell width invalid after adjustment, ignoring adjust_column_width");
if (ch >= 4 && ch < 1000) cell_height = ch; if (ch >= 4 && ch <= 1000) cell_height = ch;
else log_error("Cell height invalid after adjustment, ignoring adjust_line_height"); else log_error("Cell height invalid after adjustment, ignoring adjust_line_height");
int line_height_adjustment = cell_height - before_cell_height; int line_height_adjustment = cell_height - before_cell_height;
if (cell_height < 4) fatal("Line height too small after adjustment"); if (cell_height < 4) fatal("Line height too small after adjustment");