aboutsummaryrefslogtreecommitdiff
path: root/render.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-09-07 17:41:42 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-09-07 17:41:42 +0000
commit19ec06b999c01f1838625fa8f691901d16a66607 (patch)
tree04ea3d55766a02677bc61aaf12758cb56b69dff9 /render.c
parentinput: fix assertion when pressing first one mouse button, then another (diff)
parentgrid: 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.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/render.c b/render.c
index 5d4d712b..f2d976f8 100644
--- a/render.c
+++ b/render.c
@@ -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);