diff options
| -rw-r--r-- | runtime/doc/ui.txt | 7 | ||||
| -rw-r--r-- | src/nvim/window.c | 4 | ||||
| -rw-r--r-- | test/functional/ui/multigrid_spec.lua | 1 |
3 files changed, 10 insertions, 2 deletions
diff --git a/runtime/doc/ui.txt b/runtime/doc/ui.txt index ead5e31e32..ec1d43d878 100644 --- a/runtime/doc/ui.txt +++ b/runtime/doc/ui.txt @@ -643,6 +643,13 @@ tabs. only count as one line. When scrolling more than a full screen it is an approximate value. + All updates, such as `grid_line`, in a batch affects the new viewport, + despite the fact that `win_viewport` is received after the updates. + Applications implementing, for example, smooth scrolling should take + this into account and keep the grid separated from what's displayed on + the screen and copy it to the viewport destination once `win_viewport` + is received. + ["win_extmark", grid, win, ns_id, mark_id, row, col] ~ Updates the position of an extmark which is currently visible in a window. Only emitted if the mark has the `ui_watched` attribute. diff --git a/src/nvim/window.c b/src/nvim/window.c index 187115a4d6..7ac6652cc2 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -1029,7 +1029,9 @@ void ui_ext_win_position(win_T *wp, bool validate) void ui_ext_win_viewport(win_T *wp) { - if ((wp == curwin || ui_has(kUIMultigrid)) && wp->w_viewport_invalid) { + // NOTE: The win_viewport command is delayed until the next flush when there are pending updates. + // This ensures that the updates and the viewport are sent together. + if ((wp == curwin || ui_has(kUIMultigrid)) && wp->w_viewport_invalid && wp->w_redr_type == 0) { const linenr_T line_count = wp->w_buffer->b_ml.ml_line_count; // Avoid ml_get errors when producing "scroll_delta". const linenr_T cur_topline = MIN(wp->w_topline, line_count); diff --git a/test/functional/ui/multigrid_spec.lua b/test/functional/ui/multigrid_spec.lua index 2e66068037..1778c8218b 100644 --- a/test/functional/ui/multigrid_spec.lua +++ b/test/functional/ui/multigrid_spec.lua @@ -3808,7 +3808,6 @@ describe('ext_multigrid', function() ]], win_viewport={ [2] = {win = {id = 1000}, topline = 30586, botline = 30592, curline = 30591, curcol = 0, linecount = 30592, sum_scroll_delta = 30588}; }} - command('autocmd CursorMoved * ++once call line("w$")') -- FIXME: this should not be needed feed('gg') screen:expect{grid=[[ ## grid 1 |