wyj/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-09-17 20:58:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(float): allow floating window in cmdline area

Browse Source 
Problem:  Floats are arbitrarily positioned at 1 row above screen size.
Solution: Position at 1 row above 'cmdheight', only if window is hidden behind the message area.
This commit is contained in:
Luuk van Baal 2024-03-01 14:51:49 +01:00
parent 5d4e1693cb
commit 884470124d
2 changed files with 73 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/window.c
View File

@ -817,9 +817,10 @@ void ui_ext_win_position(win_T *wp, bool validate)
int comp_row = (int)row - (south ? wp->w_height_outer : 0);
int comp_col = (int)col - (east ? wp->w_width_outer : 0);
int above_ch = wp->w_config.zindex < kZIndexMessages ? (int)p_ch : 0;
comp_row += grid->comp_row;
comp_col += grid->comp_col;
comp_row = MAX(MIN(comp_row, Rows - wp->w_height_outer - (p_ch > 0 ? 1 : 0)), 0);
comp_row = MAX(MIN(comp_row, Rows - wp->w_height_outer - above_ch), 0);
if (!c.fixed || east) {
comp_col = MAX(MIN(comp_col, Columns - wp->w_width_outer), 0);
}

71
test/functional/ui/float_spec.lua
View File

@ -9030,6 +9030,77 @@ describe('float window', function()
]])
end
end)
it('correctly placed in or above message area', function()
local float_opts = {relative='editor', width=5, height=1, row=100, col=1, border = 'single'}
api.nvim_set_option_value('cmdheight', 3, {})
command("echo 'cmdline'")
local win = api.nvim_open_win(api.nvim_create_buf(false, false), true, float_opts)
-- Not hidden behind message area but placed above it.
if multigrid then
screen:expect{grid=[[
## grid 1
[2:----------------------------------------]|*4
[3:----------------------------------------]|*3
## grid 2
|
{0:~ }|*3
## grid 3
cmdline |
|*2
## grid 4
{5:┌─────┐}|
{5:│}{1:^ }{5:│}|
{5:└─────┘}|
]], float_pos={
[4] = {1001, "NW", 1, 100, 1, true, 50};
}, win_viewport={
[2] = {win = 1000, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1, sum_scroll_delta = 0};
[4] = {win = 1001, topline = 0, botline = 1, curline = 0, curcol = 0, linecount = 1, sum_scroll_delta = 0};
}}
else
screen:expect{grid=[[
|
{0:~}{5:┌─────┐}{0: }|
{0:~}{5:│}{1:^ }{5:│}{0: }|
{0:~}{5:└─────┘}{0: }|
cmdline |
|*2
]]}
end
-- Not placed above message area and visible on top of it.
api.nvim_win_set_config(win, {zindex = 300})
if multigrid then
screen:expect{grid=[[
## grid 1
[2:----------------------------------------]|*4
[3:----------------------------------------]|*3
## grid 2
|
{0:~ }|*3
## grid 3
cmdline |
|*2
## grid 4
{5:┌─────┐}|
{5:│}{1:^ }{5:│}|
{5:└─────┘}|
]], float_pos={
[4] = {1001, "NW", 1, 100, 1, true, 300};
}, win_viewport={
[2] = {win = 1000, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1, sum_scroll_delta = 0};
[4] = {win = 1001, topline = 0, botline = 1, curline = 0, curcol = 0, linecount = 1, sum_scroll_delta = 0};
}}
else
screen:expect{grid=[[
|
{0:~ }|*3
c{5:┌─────┐} |
{5:│}{1:^ }{5:│} |
{5:└─────┘} |
]]}
end
end)
end
describe('with ext_multigrid', function()