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

Merge pull request #21224 from luukvbaal/vim-9.0.0964

Browse Source 
refactor(ui): statusbar invalidation to win_set_inner_size()
This commit is contained in:
zeertzjq
2022-11-29 08:53:16 +08:00
committed by GitHub
parent 80b6edabe3 6b18c77a27
commit 31eb20d915
3 changed files with 52 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/nvim/testdir/test_window_cmd.vim
View File

@@ -1793,4 +1793,22 @@ function Test_splitkeep_fold()
call VerifyScreenDump(buf, 'Test_splitkeep_fold_4', {})
endfunction
function Test_splitkeep_status()
CheckScreendump
let lines =<< trim END
call setline(1, ['a', 'b', 'c'])
set nomodified
set splitkeep=screen
let win = winnr()
wincmd s
wincmd j
END
call writefile(lines, 'XTestSplitkeepStatus', 'D')
let buf = RunVimInTerminal('-S XTestSplitkeepStatus', #{rows: 10})
call term_sendkeys(buf, ":call win_move_statusline(win, 1)\<CR>")
call VerifyScreenDump(buf, 'Test_splitkeep_status_1', {})
endfunction
" vim: shiftwidth=2 sts=2 expandtab

10
src/nvim/window.c
View File

@@ -6389,9 +6389,6 @@ void win_new_height(win_T *wp, int height)
wp->w_height = height;
wp->w_pos_changed = true;
win_set_inner_size(wp, true);
if (wp->w_status_height) {
wp->w_redr_status = true;
}
}
void scroll_to_fraction(win_T *wp, int prev_height)
@@ -6487,7 +6484,6 @@ void scroll_to_fraction(win_T *wp, int prev_height)
}
redraw_later(wp, UPD_SOME_VALID);
wp->w_redr_status = true;
invalidate_botline_win(wp);
}
@@ -6554,6 +6550,7 @@ void win_set_inner_size(win_T *wp, bool valid_cursor)
wp->w_width_outer = (wp->w_width_inner + win_border_width(wp));
wp->w_winrow_off = wp->w_border_adj[0] + wp->w_winbar_height;
wp->w_wincol_off = wp->w_border_adj[3];
wp->w_redr_status = true;
}
static int win_border_height(win_T *wp)
@@ -6570,10 +6567,8 @@ static int win_border_width(win_T *wp)
void win_new_width(win_T *wp, int width)
{
wp->w_width = width;
win_set_inner_size(wp, true);
wp->w_redr_status = true;
wp->w_pos_changed = true;
win_set_inner_size(wp, true);
}
void win_comp_scroll(win_T *wp)
@@ -6974,7 +6969,6 @@ int set_winbar_win(win_T *wp, bool make_room, bool valid_cursor)
}
wp->w_winbar_height = winbar_height;
win_set_inner_size(wp, valid_cursor);
wp->w_redr_status = wp->w_redr_status || winbar_height;
if (winbar_height == 0) {
// When removing winbar, deallocate the w_winbar_click_defs array