diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-07-20 18:08:20 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-07-20 18:08:20 +0000 |
| commit | 029920ddcc00120b0480a64e5cac2114e529b59a (patch) | |
| tree | da5a9df6e7746db959cecc01925e19acab756fc2 | |
| parent | changelog: add new ‘unreleased’ section (diff) | |
| parent | render: prevent cells from overflowing into margin (diff) | |
Merge branch 'prevent-overflow-into-margin'
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | render.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c7968d4..7a997e7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,11 @@ ### Deprecated ### Removed ### Fixed + +* Rendering into the right margin area with `tweak.overflowing-glyphs` + enabled. + + ### Security ### Contributors @@ -617,7 +617,8 @@ render_cell(struct terminal *term, pixman_image_t *pix, */ int render_width = cell_cols * width; if (term->conf->tweak.overflowing_glyphs && - glyph_count > 0) + glyph_count > 0 && + cols_left > cell_cols) { int glyph_width = 0, advance = 0; for (size_t i = 0; i < glyph_count; i++) { |
