diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-10-27 11:31:38 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-10-27 11:35:11 -0400 |
| commit | 0f7a645f544cb02d6a48749a5f60f8c43e89fd3d (patch) | |
| tree | 063efc7d0c0bda956f33e6378b8cf9921a73e71c /src | |
| parent | 7c26be61bb5a405f28ae230cd3602ecb6e30a3a9 (diff) | |
| download | rneovim-0f7a645f544cb02d6a48749a5f60f8c43e89fd3d.tar.gz rneovim-0f7a645f544cb02d6a48749a5f60f8c43e89fd3d.tar.bz2 rneovim-0f7a645f544cb02d6a48749a5f60f8c43e89fd3d.zip | |
vim-patch:8.1.2154: quickfix window height wrong when there is a tabline
Problem: Quickfix window height wrong when there is a tabline. (Daniel
Hahler)
Solution: Take the tabline height into account. (closes vim/vim#5058)
https://github.com/vim/vim/commit/1142a31b8c44c4e7dbf28a83ae52995113b37917
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/quickfix.c | 3 | ||||
| -rw-r--r-- | src/nvim/testdir/test_quickfix.vim | 12 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c index d900ea3c70..4ca9ca2a3e 100644 --- a/src/nvim/quickfix.c +++ b/src/nvim/quickfix.c @@ -3165,7 +3165,8 @@ static int qf_goto_cwindow(const qf_info_T *qi, bool resize, int sz, win_setwidth(sz); } } else if (sz != win->w_height - && win->w_height + win->w_status_height < cmdline_row) { + && (win->w_height + win->w_status_height + tabline_height() + < cmdline_row)) { win_setheight(sz); } } diff --git a/src/nvim/testdir/test_quickfix.vim b/src/nvim/testdir/test_quickfix.vim index 2eb20e61bd..31b0c0cd2c 100644 --- a/src/nvim/testdir/test_quickfix.vim +++ b/src/nvim/testdir/test_quickfix.vim @@ -282,6 +282,18 @@ func Test_copenHeight() quit endfunc +func Test_copenHeight_tabline() + set tabline=foo showtabline=2 + copen + wincmd H + let height = winheight(0) + copen 10 + call assert_equal(height, winheight(0)) + quit + set tabline& showtabline& +endfunc + + " Tests for the :cfile, :lfile, :caddfile, :laddfile, :cgetfile and :lgetfile " commands. func XfileTests(cchar) |