Merge branch 'prevent-overflow-into-margin'

This commit is contained in:
Daniel Eklöf 2021-07-20 20:08:20 +02:00
commit 029920ddcc
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 7 additions and 1 deletions

View file

@ -35,6 +35,11 @@
### Deprecated
### Removed
### Fixed
* Rendering into the right margin area with `tweak.overflowing-glyphs`
enabled.
### Security
### Contributors

View file

@ -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++) {