mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-05 04:06:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

grid: reflow: always emit *all* cells of a multi-column character

Browse source
This commit is contained in:
Daniel Eklöf 2020-07-14 12:15:25 +02:00
parent 7480c1c06b
commit 3fd61fa120
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
grid.c
View file

@ -217,7 +217,12 @@ grid_reflow(struct grid *grid, int new_rows, int new_cols,
if (new_cols_left < cols_needed && new_cols_left >= old_cols_left)
empty_count = max(0, empty_count - (cols_needed - new_cols_left));
for (int i = 0; i < empty_count + 1; i++) {
int width = max(1, wcwidth(old_row->cells[c].wc));
/* Multi-column characters are never cut in half */
assert(c + width <= old_cols);
for (int i = 0; i < empty_count + width; i++) {
const struct cell *old_cell = &old_row->cells[c - empty_count + i];
/* Out of columns on current row in new grid? */
@ -244,6 +249,7 @@ grid_reflow(struct grid *grid, int new_rows, int new_cols,
new_col_idx++;
}
c += width - 1;
empty_count = 0;
}