Merge pull request #9368 from bfredl/doublewrap

TUI: handle wrap of doublewidth chars correctly
This commit is contained in:
Björn Linse 2018-12-15 12:54:06 +01:00 committed by GitHub
commit 2aba5569a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1279,9 +1279,10 @@ static void tui_raw_line(UI *ui, Integer g, Integer linerow, Integer startcol,
// width and the line continuation is within the grid.
if (endcol != grid->width) {
// Print the last cell of the row, if we haven't already done so.
cursor_goto(ui, (int)linerow, grid->width - 1);
print_cell(ui, &grid->cells[linerow][grid->width - 1]);
// Print the last char of the row, if we haven't already done so.
int size = grid->cells[linerow][grid->width - 1].data[0] == NUL ? 2 : 1;
cursor_goto(ui, (int)linerow, grid->width - size);
print_cell(ui, &grid->cells[linerow][grid->width - size]);
}
// Wrap the cursor over to the next line. The next line will be