IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22673 from Diablo-D3/fixfloatclamp

Browse Source 
fix(float): remove -1 in height clamp
This commit is contained in:
bfredl 2023-03-19 13:48:05 +01:00 committed by GitHub
commit 65046c830e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/window.c
View File

@ -834,7 +834,7 @@ void win_config_float(win_T *wp, FloatConfig fconfig)
} }
if (!ui_has(kUIMultigrid)) { if (!ui_has(kUIMultigrid)) {
wp->w_height = MIN(wp->w_height, Rows - 1 - win_border_height(wp)); wp->w_height = MIN(wp->w_height, Rows - win_border_height(wp));
wp->w_width = MIN(wp->w_width, Columns - win_border_width(wp)); wp->w_width = MIN(wp->w_width, Columns - win_border_width(wp));
} }

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

@ -2015,7 +2015,7 @@ describe('float window', function()
it('terminates border on edge of viewport when window extends past viewport', function() it('terminates border on edge of viewport when window extends past viewport', function()
local buf = meths.create_buf(false, false) local buf = meths.create_buf(false, false)
meths.open_win(buf, false, {relative='editor', width=40, height=7, row=0, col=0, border="single"}) meths.open_win(buf, false, {relative='editor', width=40, height=7, row=0, col=0, border="single", zindex=201})
if multigrid then if multigrid then
screen:expect{grid=[[ screen:expect{grid=[[
## grid 1 ## grid 1
@ -2046,7 +2046,7 @@ describe('float window', function()
{5:│}{2:~ }{5:│}| {5:│}{2:~ }{5:│}|
{5:└────────────────────────────────────────┘}| {5:└────────────────────────────────────────┘}|
]], float_pos={ ]], float_pos={
[4] = { { id = 1001 }, "NW", 1, 0, 0, true } [4] = { { id = 1001 }, "NW", 1, 0, 0, true, 201 }
}, win_viewport={ }, win_viewport={
[2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1, sum_scroll_delta = 0}; [2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1, sum_scroll_delta = 0};
[4] = {win = {id = 1001}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1, sum_scroll_delta = 0}; [4] = {win = {id = 1001}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1, sum_scroll_delta = 0};
@ -2058,8 +2058,8 @@ describe('float window', function()
{5:│}{2:~ }{5:│}| {5:│}{2:~ }{5:│}|
{5:│}{2:~ }{5:│}| {5:│}{2:~ }{5:│}|
{5:│}{2:~ }{5:│}| {5:│}{2:~ }{5:│}|
{5:│}{2:~ }{5:│}|
{5:└──────────────────────────────────────┘}| {5:└──────────────────────────────────────┘}|
|
]]} ]]}
end end
end) end)
@ -3723,9 +3723,9 @@ describe('float window', function()
]], float_pos=expected_pos} ]], float_pos=expected_pos}
else else
screen:expect([[ screen:expect([[
{1:very } | {1:such } |
{0:~ }{1:^float }{0: }| {0:~ }{1:very }{0: }|
| ^ |
]]) ]])
end end