diff options
| author | Sean Dewar <seandewar@users.noreply.github.com> | 2023-04-17 16:41:20 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2023-04-17 16:41:20 +0100 |
| commit | fc8a601c3251c0388a88c1235b18c529385f7196 (patch) | |
| tree | 753fd75ef5f9c60a2b4d61d6adbdc97ade5ea784 | |
| parent | 961b2e54bdbe1c06e4bf8ccf7a7e3deb129b45de (diff) | |
| download | vim-git-fc8a601c3251c0388a88c1235b18c529385f7196.tar.gz | |
patch 9.0.1461: ruler not drawn correctly when using 'rulerformat'v9.0.1461
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)
| -rw-r--r-- | src/screen.c | 16 | ||||
| -rw-r--r-- | src/testdir/dumps/Test_rulerformat_position.dump | 2 | ||||
| -rw-r--r-- | src/testdir/test_cmdline.vim | 13 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 26 insertions, 7 deletions
diff --git a/src/screen.c b/src/screen.c index 6d48ad712..cbf2ab3d8 100644 --- 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) diff --git a/src/testdir/dumps/Test_rulerformat_position.dump b/src/testdir/dumps/Test_rulerformat_position.dump new file mode 100644 index 000000000..2787a92fa --- /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 diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim index 8b717b7c2..9bb21bcfa 100644 --- 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 diff --git a/src/version.c b/src/version.c index 4f54fab42..053fe7827 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1461, +/**/ 1460, /**/ 1459, |