test/ui: properly test win_hide by explicitly marking hidden grids

This commit is contained in:
Björn Linse
2019-08-17 21:46:11 +02:00
parent 3397b8c51a
commit 6b2d67eb59
3 changed files with 22 additions and 18 deletions

View File

@ -4144,14 +4144,14 @@ describe('floating windows', function()
[4:----------------------------------------]|
[4:----------------------------------------]|
:tabnew |
## grid 2
## grid 2 (hidden)
x |
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
## grid 3
## grid 3 (hidden)
{1:y }|
{2:~ }|
## grid 4
@ -4193,7 +4193,7 @@ describe('floating windows', function()
## grid 3
{1:y }|
{2:~ }|
## grid 4
## grid 4 (hidden)
|
{0:~ }|
{0:~ }|
@ -4223,13 +4223,13 @@ describe('floating windows', function()
[4:----------------------------------------]|
[4:----------------------------------------]|
:tabnext |
## grid 2
## grid 2 (hidden)
x |
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
## grid 3
## grid 3 (hidden)
{1:y }|
{2:~ }|
## grid 4
@ -4267,7 +4267,7 @@ describe('floating windows', function()
[4:----------------------------------------]|
[4:----------------------------------------]|
:tabnew |
## grid 2
## grid 2 (hidden)
x |
{0:~ }|
{0:~ }|
@ -4313,7 +4313,7 @@ describe('floating windows', function()
{0:~ }|
{0:~ }|
{0:~ }|
## grid 4
## grid 4 (hidden)
|
{0:~ }|
{0:~ }|
@ -4333,7 +4333,7 @@ describe('floating windows', function()
[4:----------------------------------------]|
[4:----------------------------------------]|
:tabnext |
## grid 2
## grid 2 (hidden)
x |
{0:~ }|
{0:~ }|

View File

@ -1206,7 +1206,7 @@ describe('ext_multigrid', function()
]])
end)
it('handles switich tabs', function()
it('handles switch tabs', function()
command('vsp')
screen:expect([[
## grid 1
@ -1271,7 +1271,7 @@ describe('ext_multigrid', function()
[4:-----------------------------------------------------]|
{11:[No Name] }|
|
## grid 2
## grid 2 (hidden)
|
{1:~ }|
{1:~ }|
@ -1284,7 +1284,7 @@ describe('ext_multigrid', function()
{1:~ }|
{1:~ }|
{1:~ }|
## grid 3
## grid 3 (hidden)
|
{1:~ }|
{1:~ }|
@ -1328,7 +1328,7 @@ describe('ext_multigrid', function()
[4:-----------------------------------------------------]|
{12:[No Name] }|
|
## grid 2
## grid 2 (hidden)
|
{1:~ }|
{1:~ }|
@ -1341,7 +1341,7 @@ describe('ext_multigrid', function()
{1:~ }|
{1:~ }|
{1:~ }|
## grid 3
## grid 3 (hidden)
|
{1:~ }|
{1:~ }|
@ -1409,13 +1409,13 @@ describe('ext_multigrid', function()
{1:~ }|
{1:~ }|
{1:~ }|
## grid 4
## grid 4 (hidden)
|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
## grid 5
## grid 5 (hidden)
|
{1:~ }|
{1:~ }|
@ -1440,7 +1440,7 @@ describe('ext_multigrid', function()
[4:-----------------------------------------------------]|
{12:[No Name] }|
|
## grid 2
## grid 2 (hidden)
|
{1:~ }|
{1:~ }|
@ -1452,7 +1452,7 @@ describe('ext_multigrid', function()
{1:~ }|
{1:~ }|
{1:~ }|
## grid 3
## grid 3 (hidden)
|
{1:~ }|
{1:~ }|

View File

@ -1212,7 +1212,11 @@ function Screen:render(headers, attr_state, preview)
local rv = {}
for igrid,grid in pairs(self._grids) do
if headers then
table.insert(rv, "## grid "..igrid)
local suffix = ""
if igrid > 1 and self.win_position[igrid] == nil and self.float_pos[igrid] == nil then
suffix = " (hidden)"
end
table.insert(rv, "## grid "..igrid..suffix)
end
for i = 1, grid.height do
local cursor = self._cursor.grid == igrid and self._cursor.row == i