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

vim-patch:8.2.0580: window size wrong if 'ea' is off and 'splitright' is on

Browse Source 
Problem:    Window size wrong if 'ea' is off and 'splitright' is on and
            splitting then closing a window.
Solution:   Put abandoned window space in the right place. (Mark Waggoner)
edd327cc07
This commit is contained in:
zeertzjq 2022-02-12 21:16:53 +08:00
parent a1f34b2481
commit c23ec9d86e
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/nvim/testdir/test_winbuf_close.vim
View File

@ -194,3 +194,22 @@ func Test_tabwin_close()
call assert_true(v:true) call assert_true(v:true)
%bwipe! %bwipe!
endfunc endfunc
" Test when closing a split window (above/below) restores space to the window
" below when 'noequalalways' and 'splitright' are set.
func Test_window_close_splitright_noequalalways()
set noequalalways
set splitright
new
let w1 = win_getid()
new
let w2 = win_getid()
execute "normal \<c-w>b"
let h = winheight(0)
let w = win_getid()
new
q
call assert_equal(h, winheight(0), "Window height does not match eight before opening and closing another window")
call assert_equal(w, win_getid(), "Did not return to original window after opening and closing a window")
endfunc

14
src/nvim/window.c
View File

@ -3079,9 +3079,21 @@ static frame_T *win_altframe(win_T *win, tabpage_T *tp)
return frp->fr_prev; return frp->fr_prev;
} }
// By default the next window will get the space that was abandoned by this
// window
frame_T *target_fr = frp->fr_next; frame_T *target_fr = frp->fr_next;
frame_T *other_fr = frp->fr_prev; frame_T *other_fr = frp->fr_prev;
if (p_spr || p_sb) {
// If this is part of a column of windows and 'splitbelow' is true then the
// previous window will get the space.
if (frp->fr_parent != NULL && frp->fr_parent->fr_layout == FR_COL && p_sb) {
target_fr = frp->fr_prev;
other_fr = frp->fr_next;
}
// If this is part of a row of windows, and 'splitright' is true then the
// previous window will get the space.
if (frp->fr_parent != NULL && frp->fr_parent->fr_layout == FR_ROW && p_spr) {
target_fr = frp->fr_prev; target_fr = frp->fr_prev;
other_fr = frp->fr_next; other_fr = frp->fr_next;
} }