Mercurial > vim
diff src/drawline.c @ 30741:11875afe85b2 v9.0.0705
patch 9.0.0705: virtual text truncation does not take padding into account
Commit: https://github.com/vim/vim/commit/13845c48d8ca96e0fa5bb237db519dd00045742f
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Oct 9 15:26:03 2022 +0100
patch 9.0.0705: virtual text truncation does not take padding into account
Problem: Virtual text truncation does not take padding into account.
Solution: Subtract the padding from the available space. (closes https://github.com/vim/vim/issues/11318)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 09 Oct 2022 16:30:03 +0200 |
| parents | cb8094ff4f36 |
| children | 6fe513996997 |
line wrap: on
line diff
--- a/src/drawline.c +++ b/src/drawline.c @@ -573,6 +573,7 @@ textprop_size_after_trunc( win_T *wp, int flags, // TP_FLAG_ALIGN_* int added, + int padding, char_u *text, int *n_used_ptr) { @@ -585,6 +586,8 @@ textprop_size_after_trunc( // if the remaining size is to small wrap anyway and use the next line if (space < PROP_TEXT_MIN_CELLS) space += wp->w_width; + if (flags & TP_FLAG_ALIGN_BELOW) + space -= padding; for (n_used = 0; n_used < len; n_used += (*mb_ptr2len)(text + n_used)) { int clen = ptr2cells(text + n_used); @@ -629,7 +632,7 @@ text_prop_position( char_u *l = NULL; int strsize = vim_strsize(*p_extra); int cells = wrap ? strsize : textprop_size_after_trunc(wp, - tp->tp_flags, before, *p_extra, &n_used); + tp->tp_flags, before, padding, *p_extra, &n_used); if (wrap || right || above || below || padding > 0 || n_used < *n_extra) { @@ -715,7 +718,7 @@ text_prop_position( // change last character to '…' lp -= (*mb_head_off)(l, lp); STRCPY(lp, "…"); - n_used = lp - l + 3 - padding; + n_used = lp - l + 3 - before - padding; } else // change last character to '>'