aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-07-20 18:08:20 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-07-20 18:08:20 +0000
commit029920ddcc00120b0480a64e5cac2114e529b59a (patch)
treeda5a9df6e7746db959cecc01925e19acab756fc2
parentchangelog: add new ‘unreleased’ section (diff)
parentrender: prevent cells from overflowing into margin (diff)
Merge branch 'prevent-overflow-into-margin'
-rw-r--r--CHANGELOG.md5
-rw-r--r--render.c3
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
diff --git a/render.c b/render.c
index 7750dd19..6e0e82bf 100644
--- a/render.c
+++ b/render.c
@@ -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++) {