IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

scroll: use win->w_viewport_invalid

Browse Source
This commit is contained in:
Rom Grk 2020-10-24 20:16:58 -04:00
parent bcf79c62bc
commit a1596f0b0b
3 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/buffer_defs.h
View File

@ -1204,9 +1204,6 @@ struct window_S {
colnr_T w_skipcol; // starting column when a single line colnr_T w_skipcol; // starting column when a single line
// doesn't fit in the window // doesn't fit in the window
linenr_T w_last_topline; ///< last known value for topline
colnr_T w_last_leftcol; ///< last known value for leftcol
// //
// Layout of the window in the screen. // Layout of the window in the screen.
// May need to add "msg_scrolled" to "w_winrow" in rare situations. // May need to add "msg_scrolled" to "w_winrow" in rare situations.

7
src/nvim/edit.c
View File

@ -1483,13 +1483,8 @@ static void ins_redraw(
} }
if (ready && has_event(EVENT_SCROLL) if (ready && has_event(EVENT_SCROLL)
&& (curwin->w_last_topline != curwin->w_topline || && curwin->w_viewport_invalid) {
curwin->w_last_leftcol != curwin->w_leftcol)) {
apply_autocmds(EVENT_SCROLL, NULL, NULL, false, curbuf); apply_autocmds(EVENT_SCROLL, NULL, NULL, false, curbuf);
curwin->w_last_topline = curwin->w_topline;
curwin->w_last_leftcol = curwin->w_leftcol;
} }
if (curwin->w_p_cole > 0 && conceal_cursor_line(curwin) if (curwin->w_p_cole > 0 && conceal_cursor_line(curwin)

8
src/nvim/normal.c
View File

@ -1197,13 +1197,8 @@ static void normal_check_window_scrolled(NormalState *s)
{ {
// Trigger Scroll if the window moved. // Trigger Scroll if the window moved.
if (!finish_op && has_event(EVENT_SCROLL) if (!finish_op && has_event(EVENT_SCROLL)
&& (curwin->w_last_topline != curwin->w_topline || && curwin->w_viewport_invalid) {
curwin->w_last_leftcol != curwin->w_leftcol)) {
apply_autocmds(EVENT_SCROLL, NULL, NULL, false, curbuf); apply_autocmds(EVENT_SCROLL, NULL, NULL, false, curbuf);
curwin->w_last_topline = curwin->w_topline;
curwin->w_last_leftcol = curwin->w_leftcol;
} }
} }
@ -1293,7 +1288,6 @@ static void normal_redraw(NormalState *s)
xfree(p); xfree(p);
} }
// show fileinfo after redraw // show fileinfo after redraw
if (need_fileinfo && !shortmess(SHM_FILEINFO)) { if (need_fileinfo && !shortmess(SHM_FILEINFO)) {
fileinfo(false, true, false); fileinfo(false, true, false);