diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2020-11-16 21:23:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-16 21:23:09 +0100 |
| commit | dd48198e62a06c95ec98cdf3f4296c8e5f539550 (patch) | |
| tree | a4e102d07c6c0d384c693ae469b7abbf65f2ec6b /src | |
| parent | ba21ea51b0edb7c059ba6924619594f961882456 (diff) | |
| parent | 6a2cd5788687053ae613dced05c261a876f3ca46 (diff) | |
| download | rneovim-dd48198e62a06c95ec98cdf3f4296c8e5f539550.tar.gz rneovim-dd48198e62a06c95ec98cdf3f4296c8e5f539550.tar.bz2 rneovim-dd48198e62a06c95ec98cdf3f4296c8e5f539550.zip | |
Merge pull request #13303 from vigoux/fix-13298
fix(floatwin): don't always use winheight
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/window.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c index 4078cd31ac..17d9b8f483 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -4608,11 +4608,12 @@ static void win_enter_ext(win_T *wp, bool undo_sync, int curwin_invalid, redraw_all_later(NOT_VALID); } - /* set window height to desired minimal value */ - if (curwin->w_height < p_wh && !curwin->w_p_wfh) + // set window height to desired minimal value + if (curwin->w_height < p_wh && !curwin->w_p_wfh && !curwin->w_floating) { win_setheight((int)p_wh); - else if (curwin->w_height == 0) + } else if (curwin->w_height == 0) { win_setheight(1); + } // set window width to desired minimal value if (curwin->w_width < p_wiw && !curwin->w_p_wfw && !wp->w_floating) { |