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

fix(winbar): set w_winrow_off when initializing firstwin size (#18793)

Browse Source
This commit is contained in:
zeertzjq
2022-05-29 16:26:55 +08:00
committed by GitHub
parent 6d30efddb7
commit 015656abd7
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/nvim/window.c
View File

@@ -3993,6 +3993,7 @@ void win_init_size(void)
firstwin->w_height = ROWS_AVAIL; firstwin->w_height = ROWS_AVAIL;
firstwin->w_height_inner = firstwin->w_height - firstwin->w_winbar_height; firstwin->w_height_inner = firstwin->w_height - firstwin->w_winbar_height;
firstwin->w_height_outer = firstwin->w_height; firstwin->w_height_outer = firstwin->w_height;
firstwin->w_winrow_off = firstwin->w_winbar_height;
topframe->fr_height = ROWS_AVAIL; topframe->fr_height = ROWS_AVAIL;
firstwin->w_width = Columns; firstwin->w_width = Columns;
firstwin->w_width_inner = firstwin->w_width; firstwin->w_width_inner = firstwin->w_width;

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

@@ -26,6 +26,8 @@ describe('winbar', function()
[7] = {background = Screen.colors.LightGrey}, [7] = {background = Screen.colors.LightGrey},
[8] = {background = Screen.colors.LightMagenta}, [8] = {background = Screen.colors.LightMagenta},
[9] = {bold = true, foreground = Screen.colors.Blue, background = Screen.colors.LightMagenta}, [9] = {bold = true, foreground = Screen.colors.Blue, background = Screen.colors.LightMagenta},
[10] = {background = Screen.colors.LightGrey, underline = true},
[11] = {background = Screen.colors.LightGrey, underline = true, bold = true, foreground = Screen.colors.Magenta},
}) })
meths.set_option('winbar', 'Set Up The Bars') meths.set_option('winbar', 'Set Up The Bars')
end) end)
@@ -245,6 +247,23 @@ describe('winbar', function()
{4:[No Name] }| {4:[No Name] }|
| |
]]) ]])
-- Test for issue #18791
command('tabnew')
screen:expect([[
{10: }{11:4}{10: [No Name] }{1: [No Name] }{2: }{10:X}|
{1:Set Up The Bars }|
^ |
{3:~ }|
{3:~ }|
{3:~ }|
{3:~ }|
{3:~ }|
{3:~ }|
{3:~ }|
{3:~ }|
{4:[No Name] }|
|
]])
end) end)
it('mouse click and drag work correctly in buffer', function() it('mouse click and drag work correctly in buffer', function()