thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.0.0705: virtual text truncation does not take padding into account

Browse Source 
Problem:    Virtual text truncation does not take padding into account.
Solution:   Subtract the padding from the available space. (closes #11318)
This commit is contained in:
Bram Moolenaar
2022-10-09 15:26:03 +01:00
parent b7af5a0445
commit 13845c48d8
4 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/drawline.c
View File

@@ -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 '>'