To: vim_dev@googlegroups.com Subject: Patch 8.2.2685 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2685 (after 8.2.2152) Problem: Custom statusline not drawn correctly with WinBar. Solution: Also adjust the column for the custom status line. (Yee Cheng Chin, closes #8047) Files: src/drawscreen.c, src/proto/drawscreen.pro, src/screen.c, src/testdir/dumps/Test_winbar_not_visible_custom_statusline.dump, src/testdir/test_winbar.vim *** ../vim-8.2.2684/src/drawscreen.c 2021-03-30 22:11:53.085681525 +0200 --- src/drawscreen.c 2021-04-01 15:48:25.993895702 +0200 *************** *** 380,386 **** /* * Return the row for drawing the statusline and the ruler of window "wp". */ ! static int statusline_row(win_T *wp) { #if defined(FEAT_PROP_POPUP) --- 380,386 ---- /* * Return the row for drawing the statusline and the ruler of window "wp". */ ! int statusline_row(win_T *wp) { #if defined(FEAT_PROP_POPUP) *** ../vim-8.2.2684/src/proto/drawscreen.pro 2020-04-05 18:56:02.233436590 +0200 --- src/proto/drawscreen.pro 2021-04-01 15:48:25.993895702 +0200 *************** *** 1,5 **** --- 1,6 ---- /* drawscreen.c */ int update_screen(int type_arg); + int statusline_row(win_T *wp); void showruler(int always); void win_redr_ruler(win_T *wp, int always, int ignore_pum); void after_updating_screen(int may_resize_shell); *** ../vim-8.2.2684/src/screen.c 2021-03-21 14:39:15.875160577 +0100 --- src/screen.c 2021-04-01 15:48:25.993895702 +0200 *************** *** 1248,1254 **** } else { ! row = W_WINROW(wp) + wp->w_height; fillchar = fillchar_status(&attr, wp); maxwidth = wp->w_width; --- 1248,1254 ---- } else { ! row = statusline_row(wp); fillchar = fillchar_status(&attr, wp); maxwidth = wp->w_width; *** ../vim-8.2.2684/src/testdir/dumps/Test_winbar_not_visible_custom_statusline.dump 2021-04-01 16:15:43.812876066 +0200 --- src/testdir/dumps/Test_winbar_not_visible_custom_statusline.dump 2021-04-01 15:48:25.993895702 +0200 *************** *** 0 **** --- 1,10 ---- + |a+1&#ffffff0|b|c|d|e| @69 + > +0&&@74 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |a+3#0000000&|b|c|d|e| @69 + | +0&&@74 *** ../vim-8.2.2684/src/testdir/test_winbar.vim 2021-03-30 22:11:53.085681525 +0200 --- src/testdir/test_winbar.vim 2021-04-01 15:48:25.993895702 +0200 *************** *** 141,144 **** --- 141,164 ---- call delete('XtestWinbarNotVisble') endfunction + func Test_winbar_not_visible_custom_statusline() + CheckScreendump + + let lines =<< trim END + split + nnoremenu WinBar.Test :test + set winminheight=0 + set statusline=abcde + wincmd j + wincmd _ + END + call writefile(lines, 'XtestWinbarNotVisble') + let buf = RunVimInTerminal('-S XtestWinbarNotVisble', #{rows: 10}) + call VerifyScreenDump(buf, 'Test_winbar_not_visible_custom_statusline', {}) + + " clean up + call StopVimInTerminal(buf) + call delete('XtestWinbarNotVisble') + endfunction + " vim: shiftwidth=2 sts=2 expandtab *** ../vim-8.2.2684/src/version.c 2021-04-01 13:39:47.504992915 +0200 --- src/version.c 2021-04-01 16:15:51.732851910 +0200 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2685, /**/ -- It is hard to understand how a cemetery raised its burial cost and blamed it on the cost of living. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///