diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-09-07 17:41:42 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-09-07 17:41:42 +0000 |
| commit | 19ec06b999c01f1838625fa8f691901d16a66607 (patch) | |
| tree | 04ea3d55766a02677bc61aaf12758cb56b69dff9 /render.c | |
| parent | input: fix assertion when pressing first one mouse button, then another (diff) | |
| parent | grid: reflow: calculate width of composed characters correctly (diff) | |
Merge branch 'reflow-multi-column-composed-characters' into master
Diffstat (limited to 'render.c')
| -rw-r--r-- | render.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -2110,12 +2110,14 @@ maybe_resize(struct terminal *term, int width, int height, bool force) grid_reflow( &term->normal, new_normal_grid_rows, new_cols, old_rows, new_rows, term->grid == &term->normal ? ALEN(tracking_points) : 0, - term->grid == &term->normal ? tracking_points : NULL); + term->grid == &term->normal ? tracking_points : NULL, + term->composed_count, term->composed); grid_reflow( &term->alt, new_alt_grid_rows, new_cols, old_rows, new_rows, term->grid == &term->alt ? ALEN(tracking_points) : 0, - term->grid == &term->alt ? tracking_points : NULL); + term->grid == &term->alt ? tracking_points : NULL, + term->composed_count, term->composed); /* Reset tab stops */ tll_free(term->tab_stops); |
