floats: z-index

This commit is contained in:
Björn Linse
2021-05-01 13:29:34 +02:00
parent 7d82ea0102
commit edb5864a29
11 changed files with 148 additions and 36 deletions

View File

@@ -1077,8 +1077,8 @@ describe('float window', function()
{1: abb }|
{13: acc }|
]], float_pos={
[5] = { { id = 1002 }, "NW", 1, 0, 5, true },
[6] = { { id = -1 }, "NW", 5, 4, 0, false }
[5] = { { id = 1002 }, "NW", 1, 0, 5, true, 50 },
[6] = { { id = -1 }, "NW", 5, 4, 0, false, 100 }
}, win_viewport={
[2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0};
[5] = {win = {id = 1002}, topline = 0, botline = 3, curline = 2, curcol = 3};
@@ -2755,8 +2755,8 @@ describe('float window', function()
{1: word }|
{1: longtext }|
]], float_pos={
[4] = {{ id = 1001 }, "NW", 1, 2, 5, true},
[5] = {{ id = -1 }, "NW", 4, 1, 1, false}
[4] = {{ id = 1001 }, "NW", 1, 2, 5, true, 50},
[5] = {{ id = -1 }, "NW", 4, 1, 1, false, 100}
}}
else
screen:expect([[
@@ -2842,8 +2842,8 @@ describe('float window', function()
{1:yy }|
{1:zz }|
]], float_pos={
[4] = {{ id = 1001 }, "NW", 1, 2, 5, true},
[5] = {{ id = -1 }, "NW", 2, 1, 0, false}
[4] = {{ id = 1001 }, "NW", 1, 2, 5, true, 50},
[5] = {{ id = -1 }, "NW", 2, 1, 0, false, 100}
}}
else
screen:expect([[
@@ -3104,7 +3104,7 @@ describe('float window', function()
{1:word }|
{1:longtext }|
]], float_pos={
[4] = {{id = -1}, "NW", 2, 1, 0, false}}
[4] = {{id = -1}, "NW", 2, 1, 0, false, 100}}
}
else
screen:expect([[
@@ -3148,8 +3148,8 @@ describe('float window', function()
{15:some info }|
{15:about item }|
]], float_pos={
[4] = {{id = -1}, "NW", 2, 1, 0, false},
[6] = {{id = 1002}, "NW", 2, 1, 12, true},
[4] = {{id = -1}, "NW", 2, 1, 0, false, 100},
[6] = {{id = 1002}, "NW", 2, 1, 12, true, 50},
}}
else
screen:expect([[
@@ -3263,7 +3263,7 @@ describe('float window', function()
{1:word }|
{1:longtext }|
]], float_pos={
[4] = {{id = -1}, "NW", 2, 1, 0, false},
[4] = {{id = -1}, "NW", 2, 1, 0, false, 100},
}}
else
screen:expect([[
@@ -6296,6 +6296,69 @@ describe('float window', function()
]]}
end
end)
it('can use z-index', function()
local buf = meths.create_buf(false,false)
local win1 = meths.open_win(buf, false, {relative='editor', width=20, height=3, row=1, col=5, zindex=30})
meths.win_set_option(win1, "winhl", "Normal:ErrorMsg,EndOfBuffer:ErrorMsg")
local win2 = meths.open_win(buf, false, {relative='editor', width=20, height=3, row=2, col=6, zindex=50})
meths.win_set_option(win2, "winhl", "Normal:Search,EndOfBuffer:Search")
local win3 = meths.open_win(buf, false, {relative='editor', width=20, height=3, row=3, col=7, zindex=40})
meths.win_set_option(win3, "winhl", "Normal:Question,EndOfBuffer:Question")
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 4
{7: }|
{7:~ }|
{7:~ }|
## grid 5
{17: }|
{17:~ }|
{17:~ }|
## grid 6
{8: }|
{8:~ }|
{8:~ }|
]], float_pos={
[4] = {{id = 1001}, "NW", 1, 1, 5, true, 30};
[5] = {{id = 1002}, "NW", 1, 2, 6, true, 50};
[6] = {{id = 1003}, "NW", 1, 3, 7, true, 40};
}, win_viewport={
[2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0};
[4] = {win = {id = 1001}, topline = 0, botline = 2, curline = 0, curcol = 0};
[5] = {win = {id = 1002}, topline = 0, botline = 2, curline = 0, curcol = 0};
[6] = {win = {id = 1003}, topline = 0, botline = 2, curline = 0, curcol = 0};
}}
else
screen:expect{grid=[[
^ |
{0:~ }{7: }{0: }|
{0:~ }{7:~}{17: }{0: }|
{0:~ }{7:~}{17:~ }{8: }{0: }|
{0:~ }{17:~ }{8: }{0: }|
{0:~ }{8:~ }{0: }|
|
]]}
end
end)
end
describe('with ext_multigrid', function()