mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-20 02:08:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(winbar): fix winbar disappear or glitch when moving a split (#18775)

Browse Source
This commit is contained in:
zeertzjq
2022-05-28 15:12:42 +08:00
committed by GitHub
parent 285e738942
commit 77d9c672f8
2 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/window.c
View File

@@ -1334,7 +1334,6 @@ int win_split_ins(int size, int flags, win_T *new_wp, int dir)
set_fraction(oldwin); set_fraction(oldwin);
} }
wp->w_fraction = oldwin->w_fraction; wp->w_fraction = oldwin->w_fraction;
wp->w_winbar_height = oldwin->w_winbar_height;
if (flags & WSP_VERT) { if (flags & WSP_VERT) {
wp->w_p_scr = curwin->w_p_scr; wp->w_p_scr = curwin->w_p_scr;
@@ -1571,6 +1570,8 @@ static void win_init(win_T *newp, win_T *oldp, int flags)
copyFoldingState(oldp, newp); copyFoldingState(oldp, newp);
win_init_some(newp, oldp); win_init_some(newp, oldp);
newp->w_winbar_height = oldp->w_winbar_height;
} }
/* /*

36
test/functional/ui/winbar_spec.lua
View File

@@ -459,4 +459,40 @@ describe('winbar', function()
| |
]]} ]]}
end) end)
it('works correctly when moving a split', function()
screen:try_resize(45, 6)
command('set winbar=')
command('vsplit')
command('setlocal winbar=foo')
screen:expect([[
{1:foo }│ |
^ │{3:~ }|
{3:~ }│{3:~ }|
{3:~ }│{3:~ }|
{4:[No Name] }{2:[No Name] }|
|
]])
command('wincmd L')
screen:expect([[
│{1:foo }|
{3:~ }│^ |
{3:~ }│{3:~ }|
{3:~ }│{3:~ }|
{2:[No Name] }{4:[No Name] }|
|
]])
command('wincmd w')
command('wincmd L')
screen:expect([[
{1:foo }│^ |
│{3:~ }|
{3:~ }│{3:~ }|
{3:~ }│{3:~ }|
{2:[No Name] }{4:[No Name] }|
|
]])
end)
end) end)