Mercurial > vim
changeset 32260:8f77a43f8aac v9.0.1461
patch 9.0.1461: ruler not drawn correctly when using 'rulerformat'
Commit: https://github.com/vim/vim/commit/fc8a601c3251c0388a88c1235b18c529385f7196
Author: Sean Dewar <seandewar@users.noreply.github.com>
Date: Mon Apr 17 16:41:20 2023 +0100
patch 9.0.1461: ruler not drawn correctly when using 'rulerformat'
Problem: Ruler not drawn correctly when using 'rulerformat'.
Solution: Adjust formatting depending on whether the ruler is drawn in the
statusline or the command line. (Sean Dewar, closes #12246)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 17 Apr 2023 17:45:06 +0200 |
| parents | 570757513b81 |
| children | 8f47c6cfe513 |
| files | src/screen.c src/testdir/dumps/Test_rulerformat_position.dump src/testdir/test_cmdline.vim src/version.c |
| diffstat | 4 files changed, 26 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/screen.c +++ b/src/screen.c @@ -1043,7 +1043,8 @@ win_redr_custom( { row = statusline_row(wp); fillchar = fillchar_status(&attr, wp); - maxwidth = wp->w_width; + int in_status_line = wp->w_status_height != 0; + maxwidth = in_status_line ? wp->w_width : Columns; if (draw_ruler) { @@ -1060,11 +1061,11 @@ win_redr_custom( if (*stl++ != '(') stl = p_ruf; } - col = ru_col - (Columns - wp->w_width); - if (col < (wp->w_width + 1) / 2) - col = (wp->w_width + 1) / 2; - maxwidth = wp->w_width - col; - if (!wp->w_status_height) + col = ru_col - (Columns - maxwidth); + if (col < (maxwidth + 1) / 2) + col = (maxwidth + 1) / 2; + maxwidth -= col; + if (!in_status_line) { row = Rows - 1; --maxwidth; // writing in last column may cause scrolling @@ -1084,7 +1085,8 @@ win_redr_custom( stl = p_stl; } - col += wp->w_wincol; + if (in_status_line) + col += wp->w_wincol; } if (maxwidth <= 0)
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_rulerformat_position.dump @@ -0,0 +1,2 @@ +| +0&#ffffff0@17||+1&&> +0&& +@10|l|o|n|g|i|s|h| @2
--- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -3459,4 +3459,17 @@ func Test_setcmdline() cunmap a endfunc +func Test_rulerformat_position() + CheckScreendump + + let buf = RunVimInTerminal('', #{rows: 2, cols: 20}) + call term_sendkeys(buf, ":set ruler rulerformat=longish\<CR>") + call term_sendkeys(buf, ":set laststatus=0 winwidth=1\<CR>") + call term_sendkeys(buf, "\<C-W>v\<C-W>|\<C-W>p") + call VerifyScreenDump(buf, 'Test_rulerformat_position', {}) + + " clean up + call StopVimInTerminal(buf) +endfunc + " vim: shiftwidth=2 sts=2 expandtab