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

vim-patch:9.0.0670: no space for command line when there is a tabline

Browse Source 
Problem:    No space for command line when there is a tabline.
Solution:   Correct computation of where the command line should be.
            (closes vim/vim#11295)
c9f5f73206
(cherry picked from commit 31996f7748)
This commit is contained in:
zeertzjq
2022-10-06 18:48:29 +08:00
committed by github-actions[bot]
parent 947ec159ae
commit 9857cc1dbf
4 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/option.c
View File

@@ -2461,7 +2461,9 @@ static char *set_num_option(int opt_idx, char_u *varp, long value, char *errbuf,
// if p_ch changed value, change the command line height
// Only compute the new window layout when startup has been
// completed. Otherwise the frame sizes may be wrong.
if ((p_ch != old_value || topframe->fr_height != Rows - p_ch) && full_screen) {
if ((p_ch != old_value
|| tabline_height() + topframe->fr_height != Rows - p_ch)
&& full_screen) {
command_height();
}
} else if (pp == &p_uc) {

10
src/nvim/testdir/test_cmdline.vim
View File

@@ -225,6 +225,16 @@ func Test_changing_cmdheight()
call StopVimInTerminal(buf)
endfunc
func Test_cmdheight_tabline()
CheckScreendump
let buf = RunVimInTerminal('-c "set ls=2" -c "set stal=2" -c "set cmdheight=1"', {'rows': 6})
call VerifyScreenDump(buf, 'Test_cmdheight_tabline_1', {})
" clean up
call StopVimInTerminal(buf)
endfunc
func Test_map_completion()
if !has('cmdline_compl')
return

4
src/nvim/window.c
View File

@@ -4287,7 +4287,7 @@ static void enter_tabpage(tabpage_T *tp, buf_T *old_curbuf, bool trigger_enter_a
// When cmdheight is changed in a tab page with '<C-w>-', cmdline_row is
// changed but p_ch and tp_ch_used are not changed. Thus we also need to
// check cmdline_row.
if ((row < cmdline_row) && (cmdline_row <= Rows - p_ch)) {
if (row < cmdline_row && cmdline_row <= Rows - p_ch) {
clear_cmdline = true;
}
@@ -6280,7 +6280,7 @@ void command_height(void)
curtab->tp_ch_used = p_ch;
// Update cmdline_row to what it should be: just below the last window.
cmdline_row = topframe->fr_height;
cmdline_row = topframe->fr_height + tabline_height();
// If cmdline_row is smaller than what it is supposed to be for 'cmdheight'
// then set old_p_ch to what it would be, so that the windows get resized

26
test/functional/legacy/cmdline_spec.lua
View File

@@ -5,6 +5,7 @@ local command = helpers.command
local feed = helpers.feed
local feed_command = helpers.feed_command
local exec = helpers.exec
local meths = helpers.meths
local pesc = helpers.pesc
describe('cmdline', function()
@@ -290,6 +291,31 @@ describe('cmdline', function()
|
]])
end)
-- oldtest: Test_cmdheight_tabline()
it("changing 'cmdheight' when there is a tabline", function()
local screen = Screen.new(60, 8)
screen:set_default_attr_ids({
[0] = {bold = true, foreground = Screen.colors.Blue}, -- NonText
[1] = {bold = true, reverse = true}, -- StatusLine
[2] = {bold = true}, -- TabLineSel
[3] = {reverse = true}, -- TabLineFill
})
screen:attach()
meths.set_option('laststatus', 2)
meths.set_option('showtabline', 2)
meths.set_option('cmdheight', 1)
screen:expect([[
{2: [No Name] }{3: }|
^ |
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{1:[No Name] }|
|
]])
end)
end)
describe('cmdwin', function()