diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/buffer_defs.h | 2 | ||||
| -rw-r--r-- | src/nvim/decoration.c | 5 | ||||
| -rw-r--r-- | src/nvim/drawscreen.c | 10 |
3 files changed, 7 insertions, 10 deletions
diff --git a/src/nvim/buffer_defs.h b/src/nvim/buffer_defs.h index 843eb5aa11..c4241eed45 100644 --- a/src/nvim/buffer_defs.h +++ b/src/nvim/buffer_defs.h @@ -702,8 +702,8 @@ struct file_buffer { struct { int max; // maximum number of signs on a single line + int last_max; // value of max when the buffer was last drawn int count[SIGN_SHOW_MAX]; // number of lines with number of signs - bool resized; // whether max changed at start of redraw bool autom; // whether 'signcolumn' is displayed in "auto:n>1" // configured window. "b_signcols" calculation // is skipped if false. diff --git a/src/nvim/decoration.c b/src/nvim/decoration.c index a7339772ae..07f2bfb676 100644 --- a/src/nvim/decoration.c +++ b/src/nvim/decoration.c @@ -245,8 +245,8 @@ void buf_remove_decor_sh(buf_T *buf, int row1, int row2, DecorSignHighlight *sh) buf_signcols_count_range(buf, row1, row2, -1, kFalse); } else { may_force_numberwidth_recompute(buf, true); - buf->b_signcols.resized = true; - buf->b_signcols.max = buf->b_signcols.count[0] = 0; + buf->b_signcols.count[0] = 0; + buf->b_signcols.max = 0; } } } @@ -1069,7 +1069,6 @@ void buf_signcols_count_range(buf_T *buf, int row1, int row2, int add, TriState if (clear != kTrue && width > 0) { buf->b_signcols.count[width - 1]++; if (width > buf->b_signcols.max) { - buf->b_signcols.resized = true; buf->b_signcols.max = width; } } diff --git a/src/nvim/drawscreen.c b/src/nvim/drawscreen.c index 35dcbf295b..4c1b756ea1 100644 --- a/src/nvim/drawscreen.c +++ b/src/nvim/drawscreen.c @@ -671,11 +671,10 @@ int update_screen(void) win_check_ns_hl(NULL); - // Reset b_mod_set and b_signcols.resized flags. Going through all windows is - // probably faster than going through all buffers (there could be many buffers). + // Reset b_mod_set. Going through all windows is probably faster than going + // through all buffers (there could be many buffers). FOR_ALL_WINDOWS_IN_TAB(wp, curtab) { wp->w_buffer->b_mod_set = false; - wp->w_buffer->b_signcols.resized = false; } updating_screen = false; @@ -1242,12 +1241,11 @@ static bool win_redraw_signcols(win_T *wp) } while (buf->b_signcols.max > 0 && buf->b_signcols.count[buf->b_signcols.max - 1] == 0) { - buf->b_signcols.resized = true; buf->b_signcols.max--; } int width = MIN(wp->w_maxscwidth, buf->b_signcols.max); - bool rebuild_stc = buf->b_signcols.resized && *wp->w_p_stc != NUL; + bool rebuild_stc = buf->b_signcols.max != buf->b_signcols.last_max && *wp->w_p_stc != NUL; if (rebuild_stc) { wp->w_nrwidth_line_count = 0; @@ -1536,11 +1534,11 @@ static void win_update(win_T *wp) FOR_ALL_WINDOWS_IN_TAB(win, curtab) { if (win->w_buffer == wp->w_buffer && win_redraw_signcols(win)) { - win->w_lines_valid = 0; changed_line_abv_curs_win(win); redraw_later(win, UPD_NOT_VALID); } } + buf->b_signcols.last_max = buf->b_signcols.max; init_search_hl(wp, &screen_search_hl); |