adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.1575: tabpanel not drawn correctly with wrapped lines

Browse Source 
Problem:  tabpanel not drawn correctly with wrapped lines
          (utubo, after v9.1.1534)
Solution: Use Columns as width, not the frame width
          (Hirohito Higashi)

fixes: #17774
closes: #17809

Signed-off-by: Hirohito Higashi <h.east.727@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Hirohito Higashi
2025-07-21 20:32:08 +02:00
committed by Christian Brabandt
parent b2013396d4
commit e1c507a965
5 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/screen.c
View File

@ -366,9 +366,6 @@ char_needs_redraw(int off_from, int off_to, int cols)
&& ScreenLines[off_from + 1]
!= ScreenLines[off_to + 1])))))
return TRUE;
// TODO: This is a temporary solution until the root cause is fixed.
if (firstwin->w_wincol > 0)
return TRUE;
return FALSE;
}
@ -3691,9 +3688,9 @@ screen_ins_lines(
LineOffset[j + line_count] = temp;
LineWraps[j + line_count] = FALSE;
if (can_clear((char_u *)" "))
lineclear(temp, topframe->fr_width, clear_attr);
lineclear(temp, (int)Columns, clear_attr);
else
lineinvalid(temp, topframe->fr_width);
lineinvalid(temp, (int)Columns);
}
}

10
src/testdir/dumps/Test_tabpanel_drawing_2_0.dump Normal file
View File

@ -0,0 +1,10 @@
| +0&#ffffff0@57||+1&&|++2&&| |[|N|o| |N|a|m|e|]| @7
> +0&&@57||+1&&| @18
|a+0&&@2| @54||+1&&| @18
|~+0#4040ff13&| @56||+1#0000000&| @18
|~+0#4040ff13&| @56||+1#0000000&| @18
|~+0#4040ff13&| @56||+1#0000000&| @18
|~+0#4040ff13&| @56||+1#0000000&| @18
|~+0#4040ff13&| @56||+1#0000000&| @18
|~+0#4040ff13&| @56||+1#0000000&| @18
|-+2&&@1| |I|N|S|E|R|T| |-@1| +0&&@47|2|,|1| @10|A|l@1|

10
src/testdir/dumps/Test_tabpanel_drawing_2_1.dump Normal file
View File

@ -0,0 +1,10 @@
|++2&#ffffff0| |[|N|o| |N|a|m|e|]| @7||+1&&| +0&&@57
| +1&&@18||> +0&&@57
| +1&&@18|||a+0&&@2| @54
| +1&&@18|||~+0#4040ff13&| @56
| +1#0000000&@18|||~+0#4040ff13&| @56
| +1#0000000&@18|||~+0#4040ff13&| @56
| +1#0000000&@18|||~+0#4040ff13&| @56
| +1#0000000&@18|||~+0#4040ff13&| @56
| +1#0000000&@18|||~+0#4040ff13&| @56
|-+2#0000000&@1| |I|N|S|E|R|T| |-@1| +0&&@47|2|,|1| @10|A|l@1|

21
src/testdir/test_tabpanel.vim
View File

@ -204,6 +204,27 @@ function Test_tabpanel_drawing()
call StopVimInTerminal(buf)
endfunc
function Test_tabpanel_drawing_2()
CheckScreendump
let lines =<< trim END
set showtabpanel=2
set tabpanelopt=align:right,vert
call setbufline(bufnr(), 1, ['', 'aaa'])
END
call writefile(lines, 'XTest_tabpanel_drawing_2', 'D')
let buf = RunVimInTerminal('-S XTest_tabpanel_drawing_2', {'rows': 10, 'cols': 78})
call term_sendkeys(buf, "ggo")
call VerifyScreenDump(buf, 'Test_tabpanel_drawing_2_0', {})
call term_sendkeys(buf, "\<Esc>u:set tabpanelopt+=align:left\<CR>")
call term_sendkeys(buf, "ggo")
call VerifyScreenDump(buf, 'Test_tabpanel_drawing_2_1', {})
call StopVimInTerminal(buf)
endfunc
function Test_tabpanel_drawing_with_popupwin()
CheckScreendump

2
src/version.c
View File

@ -719,6 +719,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1575,
/**/
1574,
/**/