patch 9.1.1575: tabpanel not drawn correctly with wrapped lines

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
index 8f9a1101496cb111a40001c14442bd63d25a6005..3e3c86f37a86abf7bad44e91ccca7c8a80da078e 100644 (file)
--- 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
new file mode 100644 (file)
index 0000000..8dee217
--- /dev/null
+++ 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
new file mode 100644 (file)
index 0000000..c3d257d
--- /dev/null
+++ 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
index f2925504c41b9b679dd33dd4c6eb569a505a8a56..7abf2e9bb10e43a1c526229c9b7510ab60a7594f 100644 (file)
--- 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
index f90728701aae8ae042345b3448890f1024614b27..8e4cfcc2b4707fdb741bc808ffe1dce0c9f80ffe 100644 (file)
--- 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,
 /**/