mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-07 18:36:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.1512: inserting lines when scrolling with 'smoothscroll' set

Browse Source 
Problem:    Inserting lines when scrolling with 'smoothscroll' set.
Solution:   Adjust line height computation for w_skipcol. (Luuk van Baal,
            closes vim/vim#12350)

c8502f9b88
This commit is contained in:
Luuk van Baal
2023-05-06 17:33:42 +02:00
parent ca5a810c4a
commit 3b2bd8d69e
4 changed files with 59 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/drawscreen.c
View File

@@ -2101,7 +2101,12 @@ static void win_update(win_T *wp, DecorProviders *providers)
if (hasFoldingWin(wp, l, NULL, &l, true, NULL)) {
new_rows++;
} else if (l == wp->w_topline) {
new_rows += plines_win_nofill(wp, l, true) + wp->w_topfill;
int n = plines_win_nofill(wp, l, false) + wp->w_topfill;
n = adjust_plines_for_skipcol(wp, n);
if (n > wp->w_height_inner) {
n = wp->w_height_inner;
}
new_rows += n;
} else {
new_rows += plines_win(wp, l, true);
}

6
src/nvim/move.c
View File

@@ -58,7 +58,7 @@ typedef struct {
#endif
/// Reduce "n" for the screen lines skipped with "wp->w_skipcol".
static int adjust_plines_for_skipcol(win_T *wp, int n)
int adjust_plines_for_skipcol(win_T *wp, int n)
{
if (wp->w_skipcol == 0) {
return n;
@@ -196,7 +196,7 @@ static int skipcol_from_plines(win_T *wp, int plines_off)
return skipcol;
}
/// Set wp->s_skipcol to zero and redraw later if needed.
/// Set wp->w_skipcol to zero and redraw later if needed.
static void reset_skipcol(win_T *wp)
{
if (wp->w_skipcol != 0) {
@@ -2267,7 +2267,7 @@ void cursor_correct(void)
}
if (curwin->w_p_sms && !curwin->w_p_wrap) {
// 'smoothscroll is active
// 'smoothscroll' is active
if (curwin->w_cline_height == curwin->w_height_inner) {
// The cursor line just fits in the window, don't scroll.
reset_skipcol(curwin);