diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-05-29 16:26:55 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-29 16:26:55 +0800 |
| commit | 015656abd72b7ccac966f21218c4d7108800237a (patch) | |
| tree | 281bfb45563e4d1c12a62275834bf94325f91b0b | |
| parent | 6d30efddb74300b9bacd3ddbaeef6f5dbf9e3e08 (diff) | |
| download | rneovim-015656abd72b7ccac966f21218c4d7108800237a.tar.gz rneovim-015656abd72b7ccac966f21218c4d7108800237a.tar.bz2 rneovim-015656abd72b7ccac966f21218c4d7108800237a.zip | |
fix(winbar): set w_winrow_off when initializing firstwin size (#18793)
| -rw-r--r-- | src/nvim/window.c | 1 | ||||
| -rw-r--r-- | test/functional/ui/winbar_spec.lua | 19 |
2 files changed, 20 insertions, 0 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c index 060f498f07..a41f3362d2 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -3993,6 +3993,7 @@ void win_init_size(void) firstwin->w_height = ROWS_AVAIL; firstwin->w_height_inner = firstwin->w_height - firstwin->w_winbar_height; firstwin->w_height_outer = firstwin->w_height; + firstwin->w_winrow_off = firstwin->w_winbar_height; topframe->fr_height = ROWS_AVAIL; firstwin->w_width = Columns; firstwin->w_width_inner = firstwin->w_width; diff --git a/test/functional/ui/winbar_spec.lua b/test/functional/ui/winbar_spec.lua index 982d2d67fd..92a6ab2e84 100644 --- a/test/functional/ui/winbar_spec.lua +++ b/test/functional/ui/winbar_spec.lua @@ -26,6 +26,8 @@ describe('winbar', function() [7] = {background = Screen.colors.LightGrey}, [8] = {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') end) @@ -245,6 +247,23 @@ describe('winbar', function() {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) it('mouse click and drag work correctly in buffer', function() |