Mercurial > vim
diff src/move.c @ 30675:bc48f3752d8d v9.0.0672
patch 9.0.0672: line partly shows with 'smoothscroll' and 'scrolloff' zero
Commit: https://github.com/vim/vim/commit/9bab7a024393200bb2c03b3abddfda86436990a7
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Oct 6 14:57:53 2022 +0100
patch 9.0.0672: line partly shows with 'smoothscroll' and 'scrolloff' zero
Problem: Cursor line only partly shows with 'smoothscroll' and 'scrolloff'
zero.
Solution: Do not use 'smoothscroll' when adjusting the bottom of the window.
(closes #11269)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 06 Oct 2022 16:00:04 +0200 |
| parents | 53b826c4649f |
| children | a345ad853b08 |
line wrap: on
line diff
--- a/src/move.c +++ b/src/move.c @@ -2171,6 +2171,7 @@ scroll_cursor_bot(int min_scroll, int se { int used; int scrolled = 0; + int min_scrolled = 1; int extra = 0; int i; linenr_T line_count; @@ -2236,6 +2237,10 @@ scroll_cursor_bot(int min_scroll, int se scrolled = used; if (cln == curwin->w_botline) scrolled -= curwin->w_empty_rows; + min_scrolled = scrolled; + if (cln > curwin->w_botline && curwin->w_p_sms && curwin->w_p_wrap) + for (linenr_T lnum = curwin->w_botline + 1; lnum <= cln; ++lnum) + min_scrolled += plines_nofill(lnum); } /* @@ -2361,7 +2366,12 @@ scroll_cursor_bot(int min_scroll, int se if (line_count >= curwin->w_height && line_count > min_scroll) scroll_cursor_halfway(FALSE); else + { + // With 'smoothscroll' scroll at least the height of the cursor line. + if (curwin->w_p_wrap && curwin->w_p_sms && line_count < min_scrolled) + line_count = min_scrolled; scrollup(line_count, TRUE); + } /* * If topline didn't change we need to restore w_botline and w_empty_rows