patch 9.1.1575: tabpanel not drawn correctly with wrapped lines

h-east · chrisbra · commit e1c507a9657f · 2025-07-21T20:32:08.000+02:00
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>
diff --git a/src/screen.c b/src/screen.c
@@ -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);
 	}
     }
 
diff --git a/src/testdir/dumps/Test_tabpanel_drawing_2_0.dump b/src/testdir/dumps/Test_tabpanel_drawing_2_0.dump
@@ -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| 
diff --git a/src/testdir/dumps/Test_tabpanel_drawing_2_1.dump b/src/testdir/dumps/Test_tabpanel_drawing_2_1.dump
@@ -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| 
diff --git a/src/testdir/test_tabpanel.vim b/src/testdir/test_tabpanel.vim
@@ -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
 
diff --git a/src/version.c b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1575,
 /**/
     1574,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -366,9 +366,6 @@ char_needs_redraw(int off_from, int off_to, int cols)`
`366`	`366`	`&& ScreenLines[off_from + 1]`
`367`	`367`	`!= ScreenLines[off_to + 1])))))`
`368`	`368`	`return TRUE;`
`369`		`- // TODO: This is a temporary solution until the root cause is fixed.`
`370`		`- if (firstwin->w_wincol > 0)`
`371`		`- return TRUE;`
`372`	`369`	`return FALSE;`
`373`	`370`	`}`
`374`	`371`
`@@ -3691,9 +3688,9 @@ screen_ins_lines(`
`3691`	`3688`	`LineOffset[j + line_count] = temp;`
`3692`	`3689`	`LineWraps[j + line_count] = FALSE;`
`3693`	`3690`	`if (can_clear((char_u *)" "))`
`3694`		`- lineclear(temp, topframe->fr_width, clear_attr);`
	`3691`	`+ lineclear(temp, (int)Columns, clear_attr);`
`3695`	`3692`	`else`
`3696`		`- lineinvalid(temp, topframe->fr_width);`
	`3693`	`+ lineinvalid(temp, (int)Columns);`
`3697`	`3694`	`}`
`3698`	`3695`	`}`
`3699`	`3696`