diff options
| author | bfredl <bjorn.linse@gmail.com> | 2022-04-05 19:34:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-05 19:34:06 +0200 |
| commit | 402a71ff87baf6f68d9dae6f5faa2b49f2d9045f (patch) | |
| tree | fadae2b5774a1f429247cc144580bd298d272446 | |
| parent | 969d600f2a107507c60e4ac3f3a8c03210662f96 (diff) | |
| parent | 6dc31eea438d4ebda06f625b0b656882c806570c (diff) | |
| download | rneovim-402a71ff87baf6f68d9dae6f5faa2b49f2d9045f.tar.gz rneovim-402a71ff87baf6f68d9dae6f5faa2b49f2d9045f.tar.bz2 rneovim-402a71ff87baf6f68d9dae6f5faa2b49f2d9045f.zip | |
Merge pull request #17335 from famiu/fix/ui/win-resize
fix: Make window resize commands manage cmdheight
| -rw-r--r-- | src/nvim/window.c | 10 | ||||
| -rw-r--r-- | test/functional/legacy/cmdline_spec.lua | 68 |
2 files changed, 69 insertions, 9 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c index 9ac51bb108..cc21bf25b0 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -5412,11 +5412,17 @@ void win_setheight_win(int height, win_T *win) // line, clear it. if (full_screen && msg_scrolled == 0 && row < cmdline_row) { grid_fill(&default_grid, row, cmdline_row, 0, Columns, ' ', ' ', 0); + if (msg_grid.chars) { + clear_cmdline = true; + } } cmdline_row = row; + p_ch = MAX(Rows - cmdline_row, 1); + curtab->tp_ch_used = p_ch; msg_row = row; msg_col = 0; redraw_all_later(NOT_VALID); + showmode(); } } @@ -5452,7 +5458,9 @@ static void frame_setheight(frame_T *curfrp, int height) if (curfrp->fr_parent == NULL) { // topframe: can only change the command line if (height > ROWS_AVAIL) { - height = ROWS_AVAIL; + // If height is greater than the available space, try to create space for the frame by + // reducing 'cmdheight' if possible, while making sure `cmdheight` doesn't go below 1. + height = MIN(ROWS_AVAIL + (p_ch - 1), height); } if (height > 0) { frame_new_height(curfrp, height, false, false); diff --git a/test/functional/legacy/cmdline_spec.lua b/test/functional/legacy/cmdline_spec.lua index 9ebe9aeb91..d8d849271b 100644 --- a/test/functional/legacy/cmdline_spec.lua +++ b/test/functional/legacy/cmdline_spec.lua @@ -11,6 +11,15 @@ describe('cmdline', function() it('is cleared when switching tabs', function() local screen = Screen.new(30, 10) screen:attach() + screen:set_default_attr_ids { + [1] = {underline = true, background = Screen.colors.LightGrey}; + [2] = {bold = true}; + [3] = {reverse = true}; + [4] = {bold = true, foreground = Screen.colors.Blue1}; + } + -- TODO(bfredl): redraw with tabs is severly broken. fix it + feed_command [[ set display-=msgsep ]] + feed_command([[call setline(1, range(30))]]) screen:expect([[ ^0 | @@ -24,18 +33,61 @@ describe('cmdline', function() 8 | :call setline(1, range(30)) | ]]) - feed([[:tabnew<cr><C-w>-<C-w>-gtgt]]) - screen:expect([[ - + [No Name] [No Name] X| + + feed [[:tabnew<cr>]] + screen:expect{grid=[[ + {1: + [No Name] }{2: [No Name] }{3: }{1:X}| + ^ | + {4:~ }| + {4:~ }| + {4:~ }| + {4:~ }| + {4:~ }| + {4:~ }| + {4:~ }| + :tabnew | + ]]} + + feed [[<C-w>-<C-w>-]] + screen:expect{grid=[[ + {1: + [No Name] }{2: [No Name] }{3: }{1:X}| ^ | - ~ | - ~ | - ~ | - ~ | - ~ | + {4:~ }| + {4:~ }| + {4:~ }| + {4:~ }| + {4:~ }| + | + | + :tabnew | + ]]} + + feed [[gt]] + screen:expect{grid=[[ + {2: + [No Name] }{1: [No Name] }{3: }{1:X}| + ^0 | + 1 | + 2 | + 3 | + 4 | + 5 | 6 | 7 | | + ]]} + + feed [[gt]] + screen:expect([[ + {1: + [No Name] }{2: [No Name] }{3: }{1:X}| + ^ | + {4:~ }| + {4:~ }| + {4:~ }| + {4:~ }| + {4:~ }| + | + | + | ]]) end) |