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.0701: with 'smoothscroll' cursor position not adjusted in long line

Browse Source 
Problem:    With 'smoothscroll' the cursor position s not adjusted in a long
            line.
Solution:   Move the cursor further up or down in the line.

8cf3459878

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
Luuk van Baal
2023-04-26 21:56:31 +02:00
parent 2918720add
commit f3de7f4468
3 changed files with 121 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/nvim/move.c
View File

@@ -1208,6 +1208,24 @@ bool scrolldown(long line_count, int byfold)
foldAdjustCursor();
coladvance(curwin->w_curswant);
}
if (curwin->w_cursor.lnum == curwin->w_topline && do_sms) {
// make sure the cursor is in the visible text
validate_virtcol();
int col = curwin->w_virtcol - curwin->w_skipcol;
int row = 0;
if (col >= width1) {
col -= width1;
++row;
}
if (col > width2) {
row += col / width2;
col = col % width2;
}
if (row >= curwin->w_height) {
coladvance(curwin->w_virtcol - (row - curwin->w_height + 1) * width2);
}
}
return moved;
}
@@ -1245,7 +1263,7 @@ bool scrollup(long line_count, int byfold)
// for a closed fold: go to the last line in the fold
(void)hasFolding(lnum, NULL, &lnum);
}
if (lnum == curwin->w_topline && curwin->w_p_wrap && curwin->w_p_sms) {
if (lnum == curwin->w_topline && do_sms) {
// 'smoothscroll': increase "w_skipcol" until it goes over
// the end of the line, then advance to the next line.
int add = curwin->w_skipcol > 0 ? width2 : width1;
@@ -1310,6 +1328,24 @@ bool scrollup(long line_count, int byfold)
coladvance(curwin->w_curswant);
}
if (curwin->w_cursor.lnum == curwin->w_topline && do_sms && curwin->w_skipcol > 0) {
// make sure the cursor is in a visible part of the line
validate_virtcol();
if (curwin->w_virtcol < curwin->w_skipcol + 3) {
int width1 = curwin->w_width - curwin_col_off();
int width2 = width1 + curwin_col_off2();
colnr_T col = curwin->w_virtcol;
if (col < width1) {
col += width1;
}
while (col < curwin->w_skipcol + 3) {
col += width2;
}
coladvance(col);
}
}
bool moved = topline != curwin->w_topline
|| botline != curwin->w_botline;