Browse Source

float: add "solid" border style (#14310)

It looks solid with the default `FloatBorder` group.

If you set the bgcolor of FloatBorder to the same color as for FloatNormal, you
effectively get an "1-cell padding".
pull/14353/head
Marco Hinz 4 weeks ago
committed by GitHub
parent
commit
4a36ec6da0
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      src/nvim/api/private/helpers.c
  2. 43
      test/functional/ui/float_spec.lua

1
src/nvim/api/private/helpers.c

@ -1765,6 +1765,7 @@ static void parse_border_style(Object style, FloatConfig *fconfig, Error *err)
{ "double", { "", "", "", "", "", "", "", "" }, false },
{ "single", { "", "", "", "", "", "", "", "" }, false },
{ "shadow", { "", "", " ", " ", " ", " ", " ", "" }, true },
{ "solid", { " ", " ", " ", " ", " ", " ", " ", " " }, false },
{ NULL, { { NUL } } , false },
};

43
test/functional/ui/float_spec.lua

@ -690,6 +690,49 @@ describe('float window', function()
]]}
end
meths.win_set_config(win, {border="solid"})
if multigrid then
screen:expect{grid=[[
## grid 1
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[3:----------------------------------------]|
## grid 2
^ |
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
## grid 3
|
## grid 5
{5: }|
{5: }{1: halloj! }{5: }|
{5: }{1: BORDAA }{5: }|
{5: }|
]], float_pos={
[5] = { { id = 1002 }, "NW", 1, 2, 5, true }
}, win_viewport={
[2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0};
[5] = {win = {id = 1002}, topline = 0, botline = 2, curline = 0, curcol = 0};
}}
else
screen:expect{grid=[[
^ |
{0:~ }|
{0:~ }{5: }{0: }|
{0:~ }{5: }{1: halloj! }{5: }{0: }|
{0:~ }{5: }{1: BORDAA }{5: }{0: }|
{0:~ }{5: }{0: }|
|
]]}
end
-- support: ascii char, UTF-8 char, composed char, highlight per char
meths.win_set_config(win, {border={"x", {"å", "ErrorMsg"}, {"\\"}, {"n̈̊", "Search"}}})
if multigrid then

Loading…
Cancel
Save