mirror of
https://github.com/gui-cs/Terminal.Gui.git
synced 2025-12-29 01:07:58 +01:00
cherry picked from old branch
This commit is contained in:
@@ -83,18 +83,17 @@ public class Adornment : View
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
public override void BoundsToScreen (int col, int row, out int rcol, out int rrow)
|
||||
public override Rectangle BoundsToScreen (Rectangle bounds)
|
||||
{
|
||||
// Adornments are *Children* of a View, not SubViews. Thus View.BoundsToScreen will not work.
|
||||
// To get the screen-relative coordinates of a Adornment, we need to know who
|
||||
// the Parent is
|
||||
Rectangle parentFrame = Parent?.Frame ?? Frame;
|
||||
rrow = row + parentFrame.Y;
|
||||
rcol = col + parentFrame.X;
|
||||
bounds.Offset (parentFrame.X, parentFrame.Y);
|
||||
|
||||
// We now have rcol/rrow in coordinates relative to our View's SuperView. If our View's SuperView has
|
||||
// a SuperView, keep going...
|
||||
Parent?.SuperView?.BoundsToScreen (rcol, rrow, out rcol, out rrow);
|
||||
return Parent?.SuperView?.BoundsToScreen (bounds) ?? bounds;
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
|
||||
@@ -498,39 +498,22 @@ public partial class View
|
||||
/// </summary>
|
||||
public event EventHandler Initialized;
|
||||
|
||||
/// <summary>Converts a <see cref="Bounds"/>-relative region to a screen-relative region.</summary>
|
||||
public Rectangle BoundsToScreen (Rectangle region)
|
||||
/// <summary>Converts a <see cref="Bounds"/>-relative rectangle to a screen-relative rectangle.</summary>
|
||||
public virtual Rectangle BoundsToScreen (Rectangle bounds)
|
||||
{
|
||||
BoundsToScreen (region.X, region.Y, out int screenX, out int screenY);
|
||||
|
||||
return region with { X = screenX, Y = screenY };
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Converts a <see cref="Bounds"/>-relative coordinate to a screen-relative coordinate. The output is optionally
|
||||
/// clamped to the screen dimensions.
|
||||
/// </summary>
|
||||
/// <param name="x"><see cref="Bounds"/>-relative column.</param>
|
||||
/// <param name="y"><see cref="Bounds"/>-relative row.</param>
|
||||
/// <param name="rx">Absolute column; screen-relative.</param>
|
||||
/// <param name="ry">Absolute row; screen-relative.</param>
|
||||
public virtual void BoundsToScreen (int x, int y, out int rx, out int ry)
|
||||
{
|
||||
// PERF: Use Point.Offset
|
||||
// Already dealing with Point here.
|
||||
Point boundsOffset = GetBoundsOffset ();
|
||||
rx = x + Frame.X + boundsOffset.X;
|
||||
ry = y + Frame.Y + boundsOffset.Y;
|
||||
bounds.Offset(Frame.X + boundsOffset.X, Frame.Y + boundsOffset.Y);
|
||||
|
||||
View super = SuperView;
|
||||
|
||||
while (super is { })
|
||||
{
|
||||
boundsOffset = super.GetBoundsOffset ();
|
||||
rx += super.Frame.X + boundsOffset.X;
|
||||
ry += super.Frame.Y + boundsOffset.Y;
|
||||
bounds.Offset(super.Frame.X + boundsOffset.X, super.Frame.Y + boundsOffset.Y);
|
||||
super = super.SuperView;
|
||||
}
|
||||
|
||||
return bounds;
|
||||
}
|
||||
|
||||
#nullable enable
|
||||
@@ -626,7 +609,7 @@ public partial class View
|
||||
int right = Margin.Thickness.Right + Border.Thickness.Right + Padding.Thickness.Right;
|
||||
int bottom = Margin.Thickness.Bottom + Border.Thickness.Bottom + Padding.Thickness.Bottom;
|
||||
|
||||
return new Thickness (left, top, right, bottom);
|
||||
return new (left, top, right, bottom);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -635,7 +618,7 @@ public partial class View
|
||||
/// </summary>
|
||||
public Point GetBoundsOffset ()
|
||||
{
|
||||
return new Point (
|
||||
return new (
|
||||
Padding?.Thickness.GetInside (Padding.Frame).X ?? 0,
|
||||
Padding?.Thickness.GetInside (Padding.Frame).Y ?? 0
|
||||
);
|
||||
|
||||
@@ -217,7 +217,7 @@ public class TileView : View
|
||||
{
|
||||
bool isRoot = _splitterLines.Contains (line);
|
||||
|
||||
Rectangle screen = line.BoundsToScreen (new (new (0, 0), Size.Empty));
|
||||
Rectangle screen = line.BoundsToScreen (Rectangle.Empty);
|
||||
Point origin = ScreenToFrame (screen.X, screen.Y);
|
||||
int length = line.Orientation == Orientation.Horizontal ? line.Frame.Width : line.Frame.Height;
|
||||
|
||||
|
||||
502
UnitTests/View/Adornment/ToScreenTests.cs
Normal file
502
UnitTests/View/Adornment/ToScreenTests.cs
Normal file
@@ -0,0 +1,502 @@
|
||||
using Xunit.Abstractions;
|
||||
|
||||
namespace Terminal.Gui.ViewTests;
|
||||
|
||||
/// <summary>
|
||||
/// Test the <see cref="Adornment.FrameToScreen"/> and <see cref="Adornment.BoundsToScreen"/> methods.
|
||||
/// DOES NOT TEST View.xxxToScreen methods. Those are in ./View/Layout/ToScreenTests.cs
|
||||
/// </summary>
|
||||
/// <param name="output"></param>
|
||||
public class AdornmentToScreenTests (ITestOutputHelper output)
|
||||
{
|
||||
private readonly ITestOutputHelper _output = output;
|
||||
|
||||
[Theory]
|
||||
[InlineData (0, 0)]
|
||||
[InlineData (1, 1)]
|
||||
[InlineData (-1, -1)]
|
||||
[InlineData (11, 11)]
|
||||
public void FrameToScreen_NoSuperView_WithoutAdornments (int x, int expectedX)
|
||||
{
|
||||
// We test with only X because Y is equivalent. Height/Width are irrelevant.
|
||||
// Arrange
|
||||
var frame = new Rectangle (x, 0, 10, 10);
|
||||
|
||||
var view = new View ();
|
||||
view.Frame = frame;
|
||||
|
||||
// Act
|
||||
var marginScreen = view.Margin.FrameToScreen();
|
||||
var borderScreen = view.Border.FrameToScreen ();
|
||||
var paddingScreen = view.Padding.FrameToScreen ();
|
||||
|
||||
// Assert
|
||||
Assert.Equal(expectedX, marginScreen.X);
|
||||
Assert.Equal (expectedX, borderScreen.X);
|
||||
Assert.Equal (expectedX, paddingScreen.X);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData (0, 0)]
|
||||
[InlineData (1, 1)]
|
||||
[InlineData (-1, -1)]
|
||||
[InlineData (11, 11)]
|
||||
public void FrameToScreen_NoSuperView_WithAdornments (int x, int expectedX)
|
||||
{
|
||||
// We test with only X because Y is equivalent. Height/Width are irrelevant.
|
||||
// Arrange
|
||||
var frame = new Rectangle (x, 0, 10, 10);
|
||||
|
||||
var view = new View ();
|
||||
view.Border.Thickness = new (1);
|
||||
view.Frame = frame;
|
||||
|
||||
// Act
|
||||
var marginScreen = view.Margin.FrameToScreen ();
|
||||
var borderScreen = view.Border.FrameToScreen ();
|
||||
var paddingScreen = view.Padding.FrameToScreen ();
|
||||
|
||||
// Assert
|
||||
Assert.Equal (expectedX, marginScreen.X);
|
||||
Assert.Equal (expectedX + view.Margin.Thickness.Left, borderScreen.X);
|
||||
Assert.Equal (expectedX + view.Border.Thickness.Left, paddingScreen.X);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData (0, 0)]
|
||||
[InlineData (1, 1)]
|
||||
[InlineData (-1, -1)]
|
||||
[InlineData (11, 11)]
|
||||
public void FrameToScreen_SuperView_WithoutAdornments (int x, int expectedX)
|
||||
{
|
||||
// We test with only X because Y is equivalent. Height/Width are irrelevant.
|
||||
// Arrange
|
||||
var frame = new Rectangle (x, 0, 10, 10);
|
||||
|
||||
var superView = new View ()
|
||||
{
|
||||
X = 0,
|
||||
Y = 0,
|
||||
Height = Dim.Fill (),
|
||||
Width = Dim.Fill ()
|
||||
};
|
||||
|
||||
var view = new View ();
|
||||
view.Frame = frame;
|
||||
|
||||
superView.Add (view);
|
||||
superView.LayoutSubviews ();
|
||||
|
||||
// Act
|
||||
var marginScreen = view.Margin.FrameToScreen ();
|
||||
var borderScreen = view.Border.FrameToScreen ();
|
||||
var paddingScreen = view.Padding.FrameToScreen ();
|
||||
|
||||
// Assert
|
||||
Assert.Equal (expectedX, marginScreen.X);
|
||||
Assert.Equal (expectedX + view.Margin.Thickness.Left, borderScreen.X);
|
||||
Assert.Equal (expectedX + view.Border.Thickness.Left, paddingScreen.X);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData (0, 1)]
|
||||
[InlineData (1, 2)]
|
||||
[InlineData (-1, 0)]
|
||||
[InlineData (11, 12)]
|
||||
public void FrameToScreen_SuperView_WithAdornments (int x, int expectedX)
|
||||
{
|
||||
// We test with only X because Y is equivalent. Height/Width are irrelevant.
|
||||
// Arrange
|
||||
var frame = new Rectangle (x, 0, 10, 10);
|
||||
|
||||
var superView = new View ()
|
||||
{
|
||||
X = 0,
|
||||
Y = 0,
|
||||
Height = Dim.Fill (),
|
||||
Width = Dim.Fill ()
|
||||
};
|
||||
superView.Border.Thickness = new (1);
|
||||
|
||||
var view = new View ();
|
||||
view.Frame = frame;
|
||||
|
||||
superView.Add (view);
|
||||
superView.LayoutSubviews ();
|
||||
|
||||
// Act
|
||||
var marginScreen = view.Margin.FrameToScreen ();
|
||||
var borderScreen = view.Border.FrameToScreen ();
|
||||
var paddingScreen = view.Padding.FrameToScreen ();
|
||||
|
||||
// Assert
|
||||
Assert.Equal (expectedX, marginScreen.X);
|
||||
Assert.Equal (expectedX + view.Margin.Thickness.Left, borderScreen.X);
|
||||
Assert.Equal (expectedX + view.Border.Thickness.Left, paddingScreen.X);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData (0, 0)]
|
||||
[InlineData (1, 1)]
|
||||
[InlineData (-1, -1)]
|
||||
[InlineData (11, 11)]
|
||||
public void FrameToScreen_NestedSuperView_WithoutAdornments (int x, int expectedX)
|
||||
{
|
||||
// We test with only X because Y is equivalent. Height/Width are irrelevant.
|
||||
// Arrange
|
||||
var frame = new Rectangle (x, 0, 10, 10);
|
||||
|
||||
var superSuperView = new View ()
|
||||
{
|
||||
X = 0,
|
||||
Y = 0,
|
||||
Height = Dim.Fill (),
|
||||
Width = Dim.Fill ()
|
||||
};
|
||||
|
||||
var superView = new View ()
|
||||
{
|
||||
X = 0,
|
||||
Y = 0,
|
||||
Height = Dim.Fill (),
|
||||
Width = Dim.Fill ()
|
||||
};
|
||||
|
||||
superSuperView.Add (superView);
|
||||
|
||||
var view = new View ();
|
||||
view.Frame = frame;
|
||||
|
||||
superView.Add (view);
|
||||
superView.LayoutSubviews ();
|
||||
|
||||
// Act
|
||||
var marginScreen = view.Margin.FrameToScreen ();
|
||||
var borderScreen = view.Border.FrameToScreen ();
|
||||
var paddingScreen = view.Padding.FrameToScreen ();
|
||||
|
||||
// Assert
|
||||
Assert.Equal (expectedX, marginScreen.X);
|
||||
Assert.Equal (expectedX + view.Margin.Thickness.Left, borderScreen.X);
|
||||
Assert.Equal (expectedX + view.Border.Thickness.Left, paddingScreen.X);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData (0, 2)]
|
||||
[InlineData (1, 3)]
|
||||
[InlineData (-1, 1)]
|
||||
[InlineData (11, 13)]
|
||||
public void FrameToScreen_NestedSuperView_WithAdornments (int x, int expectedX)
|
||||
{
|
||||
// We test with only X because Y is equivalent. Height/Width are irrelevant.
|
||||
// Arrange
|
||||
var frame = new Rectangle (x, 0, 10, 10);
|
||||
|
||||
var superSuperView = new View ()
|
||||
{
|
||||
X = 0,
|
||||
Y = 0,
|
||||
Height = Dim.Fill (),
|
||||
Width = Dim.Fill ()
|
||||
};
|
||||
superSuperView.Border.Thickness = new (1);
|
||||
|
||||
var superView = new View ()
|
||||
{
|
||||
X = 0,
|
||||
Y = 0,
|
||||
Height = Dim.Fill (),
|
||||
Width = Dim.Fill ()
|
||||
};
|
||||
|
||||
superSuperView.Add (superView);
|
||||
superView.Border.Thickness = new (1);
|
||||
|
||||
var view = new View ();
|
||||
view.Frame = frame;
|
||||
|
||||
superView.Add (view);
|
||||
superView.LayoutSubviews ();
|
||||
|
||||
// Act
|
||||
var marginScreen = view.Margin.FrameToScreen ();
|
||||
var borderScreen = view.Border.FrameToScreen ();
|
||||
var paddingScreen = view.Padding.FrameToScreen ();
|
||||
|
||||
// Assert
|
||||
Assert.Equal (expectedX, marginScreen.X);
|
||||
Assert.Equal (expectedX + view.Margin.Thickness.Left, borderScreen.X);
|
||||
Assert.Equal (expectedX + view.Border.Thickness.Left, paddingScreen.X);
|
||||
}
|
||||
|
||||
|
||||
|
||||
[Theory]
|
||||
[InlineData (0, 0, 0)]
|
||||
[InlineData (1, 0, 1)]
|
||||
[InlineData (-1, 0, -1)]
|
||||
[InlineData (11, 0, 11)]
|
||||
public void BoundsToScreen_NoSuperView_WithoutAdornments (int frameX, int boundsX, int expectedX)
|
||||
{
|
||||
// We test with only X because Y is equivalent. Height/Width are irrelevant.
|
||||
// Arrange
|
||||
var frame = new Rectangle (frameX, 0, 10, 10);
|
||||
|
||||
var view = new View ();
|
||||
view.Frame = frame;
|
||||
|
||||
// Act
|
||||
var marginScreen = view.Margin.BoundsToScreen (new (boundsX, 0, 0, 0));
|
||||
var borderScreen = view.Border.BoundsToScreen (new (boundsX, 0, 0, 0));
|
||||
var paddingScreen = view.Padding.BoundsToScreen (new (boundsX, 0, 0, 0));
|
||||
|
||||
// Assert
|
||||
Assert.Equal (expectedX, marginScreen.X);
|
||||
Assert.Equal (expectedX + view.Margin.Thickness.Left, borderScreen.X);
|
||||
Assert.Equal (expectedX + view.Border.Thickness.Left, paddingScreen.X);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData (0, 0, 0)]
|
||||
[InlineData (1, 0, 1)]
|
||||
[InlineData (-1, 0, -1)]
|
||||
[InlineData (11, 0, 11)]
|
||||
|
||||
[InlineData (0, 1, 1)]
|
||||
[InlineData (1, 1, 2)]
|
||||
[InlineData (-1, 1, 0)]
|
||||
[InlineData (11, 1, 12)]
|
||||
|
||||
[InlineData (0, -1, -1)]
|
||||
[InlineData (1, -1, 0)]
|
||||
[InlineData (-1, -1, -2)]
|
||||
[InlineData (11, -1, 10)]
|
||||
public void BoundsToScreen_NoSuperView_WithAdornments (int frameX, int boundsX, int expectedX)
|
||||
{
|
||||
// We test with only X because Y is equivalent. Height/Width are irrelevant.
|
||||
// Arrange
|
||||
var frame = new Rectangle (frameX, 0, 10, 10);
|
||||
|
||||
var view = new View ();
|
||||
view.Border.Thickness = new (1);
|
||||
view.Frame = frame;
|
||||
|
||||
// Act
|
||||
var marginScreen = view.Margin.BoundsToScreen (new (boundsX, 0, 0, 0));
|
||||
var borderScreen = view.Border.BoundsToScreen (new (boundsX, 0, 0, 0));
|
||||
var paddingScreen = view.Padding.BoundsToScreen (new (boundsX, 0, 0, 0));
|
||||
|
||||
// Assert
|
||||
Assert.Equal (expectedX, marginScreen.X);
|
||||
Assert.Equal (expectedX, borderScreen.X);
|
||||
Assert.Equal (expectedX, paddingScreen.X);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData (0, 0, 0)]
|
||||
[InlineData (1, 0, 1)]
|
||||
[InlineData (-1, 0, -1)]
|
||||
[InlineData (11, 0, 11)]
|
||||
|
||||
[InlineData (0, 1, 1)]
|
||||
[InlineData (1, 1, 2)]
|
||||
[InlineData (-1, 1, 0)]
|
||||
[InlineData (11, 1, 12)]
|
||||
|
||||
[InlineData (0, -1, -1)]
|
||||
[InlineData (1, -1, 0)]
|
||||
[InlineData (-1, -1, -2)]
|
||||
[InlineData (11, -1, 10)]
|
||||
public void BoundsToScreen_SuperView_WithoutAdornments (int frameX, int boundsX, int expectedX)
|
||||
{
|
||||
// We test with only X because Y is equivalent. Height/Width are irrelevant.
|
||||
// Arrange
|
||||
var frame = new Rectangle (frameX, 0, 10, 10);
|
||||
|
||||
var superView = new View ()
|
||||
{
|
||||
X = 0,
|
||||
Y = 0,
|
||||
Height = Dim.Fill (),
|
||||
Width = Dim.Fill ()
|
||||
};
|
||||
|
||||
var view = new View ();
|
||||
view.Frame = frame;
|
||||
|
||||
superView.Add (view);
|
||||
superView.LayoutSubviews ();
|
||||
|
||||
// Act
|
||||
var marginScreen = view.Margin.BoundsToScreen (new (boundsX, 0, 0, 0));
|
||||
var borderScreen = view.Border.BoundsToScreen (new (boundsX, 0, 0, 0));
|
||||
var paddingScreen = view.Padding.BoundsToScreen (new (boundsX, 0, 0, 0));
|
||||
|
||||
// Assert
|
||||
Assert.Equal (expectedX, marginScreen.X);
|
||||
Assert.Equal (expectedX + view.Margin.Thickness.Left, borderScreen.X);
|
||||
Assert.Equal (expectedX + view.Border.Thickness.Left, paddingScreen.X);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData (0, 0, 1)]
|
||||
[InlineData (1, 0, 2)]
|
||||
[InlineData (-1, 0, 0)]
|
||||
[InlineData (11, 0, 12)]
|
||||
|
||||
[InlineData (0, 1, 2)]
|
||||
[InlineData (1, 1, 3)]
|
||||
[InlineData (-1, 1, 1)]
|
||||
[InlineData (11, 1, 13)]
|
||||
|
||||
[InlineData (0, -1, 0)]
|
||||
[InlineData (1, -1, 1)]
|
||||
[InlineData (-1, -1, -1)]
|
||||
[InlineData (11, -1, 11)]
|
||||
public void BoundsToScreen_SuperView_WithAdornments (int frameX, int boundsX, int expectedX)
|
||||
{
|
||||
// We test with only X because Y is equivalent. Height/Width are irrelevant.
|
||||
// Arrange
|
||||
var frame = new Rectangle (frameX, 0, 10, 10);
|
||||
|
||||
var superView = new View ()
|
||||
{
|
||||
X = 0,
|
||||
Y = 0,
|
||||
Height = Dim.Fill (),
|
||||
Width = Dim.Fill ()
|
||||
};
|
||||
superView.Border.Thickness = new (1);
|
||||
|
||||
var view = new View ();
|
||||
view.Frame = frame;
|
||||
|
||||
superView.Add (view);
|
||||
superView.LayoutSubviews ();
|
||||
|
||||
// Act
|
||||
var marginScreen = view.Margin.BoundsToScreen (new (boundsX, 0, 0, 0));
|
||||
var borderScreen = view.Border.BoundsToScreen (new (boundsX, 0, 0, 0));
|
||||
var paddingScreen = view.Padding.BoundsToScreen (new (boundsX, 0, 0, 0));
|
||||
|
||||
// Assert
|
||||
Assert.Equal (expectedX, marginScreen.X);
|
||||
Assert.Equal (expectedX + view.Margin.Thickness.Left, borderScreen.X);
|
||||
Assert.Equal (expectedX + view.Border.Thickness.Left, paddingScreen.X);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData (0, 0, 0)]
|
||||
[InlineData (1, 0, 1)]
|
||||
[InlineData (-1, 0, -1)]
|
||||
[InlineData (11, 0, 11)]
|
||||
|
||||
[InlineData (0, 1, 1)]
|
||||
[InlineData (1, 1, 2)]
|
||||
[InlineData (-1, 1, 0)]
|
||||
[InlineData (11, 1, 12)]
|
||||
|
||||
[InlineData (0, -1, -1)]
|
||||
[InlineData (1, -1, 0)]
|
||||
[InlineData (-1, -1, -2)]
|
||||
[InlineData (11, -1, 10)]
|
||||
public void BoundsToScreen_NestedSuperView_WithoutAdornments (int frameX, int boundsX, int expectedX)
|
||||
{
|
||||
// We test with only X because Y is equivalent. Height/Width are irrelevant.
|
||||
// Arrange
|
||||
var frame = new Rectangle (frameX, 0, 10, 10);
|
||||
|
||||
var superSuperView = new View ()
|
||||
{
|
||||
X = 0,
|
||||
Y = 0,
|
||||
Height = Dim.Fill (),
|
||||
Width = Dim.Fill ()
|
||||
};
|
||||
|
||||
var superView = new View ()
|
||||
{
|
||||
X = 0,
|
||||
Y = 0,
|
||||
Height = Dim.Fill (),
|
||||
Width = Dim.Fill ()
|
||||
};
|
||||
|
||||
superSuperView.Add (superView);
|
||||
|
||||
var view = new View ();
|
||||
view.Frame = frame;
|
||||
|
||||
superView.Add (view);
|
||||
superView.LayoutSubviews ();
|
||||
|
||||
// Act
|
||||
var marginScreen = view.Margin.BoundsToScreen (new (boundsX, 0, 0, 0));
|
||||
var borderScreen = view.Border.BoundsToScreen (new (boundsX, 0, 0, 0));
|
||||
var paddingScreen = view.Padding.BoundsToScreen (new (boundsX, 0, 0, 0));
|
||||
|
||||
// Assert
|
||||
Assert.Equal (expectedX, marginScreen.X);
|
||||
Assert.Equal (expectedX + view.Margin.Thickness.Left, borderScreen.X);
|
||||
Assert.Equal (expectedX + view.Border.Thickness.Left, paddingScreen.X);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData (0, 0, 2)]
|
||||
[InlineData (1, 0, 3)]
|
||||
[InlineData (-1, 0, 1)]
|
||||
[InlineData (11, 0, 13)]
|
||||
|
||||
[InlineData (0, 1, 3)]
|
||||
[InlineData (1, 1, 4)]
|
||||
[InlineData (-1, 1, 2)]
|
||||
[InlineData (11, 1, 14)]
|
||||
|
||||
[InlineData (0, -1, 1)]
|
||||
[InlineData (1, -1, 2)]
|
||||
[InlineData (-1, -1, 0)]
|
||||
[InlineData (11, -1, 12)]
|
||||
public void BoundsToScreen_NestedSuperView_WithAdornments (int frameX, int boundsX, int expectedX)
|
||||
{
|
||||
// We test with only X because Y is equivalent. Height/Width are irrelevant.
|
||||
// Arrange
|
||||
var frame = new Rectangle (frameX, 0, 10, 10);
|
||||
|
||||
var superSuperView = new View ()
|
||||
{
|
||||
X = 0,
|
||||
Y = 0,
|
||||
Height = Dim.Fill (),
|
||||
Width = Dim.Fill ()
|
||||
};
|
||||
superSuperView.Border.Thickness = new (1);
|
||||
|
||||
var superView = new View ()
|
||||
{
|
||||
X = 0,
|
||||
Y = 0,
|
||||
Height = Dim.Fill (),
|
||||
Width = Dim.Fill ()
|
||||
};
|
||||
|
||||
superSuperView.Add (superView);
|
||||
superView.Border.Thickness = new (1);
|
||||
|
||||
var view = new View ();
|
||||
view.Frame = frame;
|
||||
|
||||
superView.Add (view);
|
||||
superView.LayoutSubviews ();
|
||||
|
||||
// Act
|
||||
var marginScreen = view.Margin.BoundsToScreen (new (boundsX, 0, 0, 0));
|
||||
var borderScreen = view.Border.BoundsToScreen (new (boundsX, 0, 0, 0));
|
||||
var paddingScreen = view.Padding.BoundsToScreen (new (boundsX, 0, 0, 0));
|
||||
|
||||
// Assert
|
||||
Assert.Equal (expectedX, marginScreen.X);
|
||||
Assert.Equal (expectedX + view.Margin.Thickness.Left, borderScreen.X);
|
||||
Assert.Equal (expectedX + view.Border.Thickness.Left, paddingScreen.X);
|
||||
}
|
||||
|
||||
}
|
||||
454
UnitTests/View/Layout/ToScreenTests.cs
Normal file
454
UnitTests/View/Layout/ToScreenTests.cs
Normal file
@@ -0,0 +1,454 @@
|
||||
using Xunit.Abstractions;
|
||||
|
||||
namespace Terminal.Gui.ViewTests;
|
||||
|
||||
/// <summary>
|
||||
/// Test the <see cref="View.FrameToScreen"/> and <see cref="View.BoundsToScreen"/> methods.
|
||||
/// DOES NOT TEST Adornment.xxxToScreen methods. Those are in ./Adornment/ToScreenTests.cs
|
||||
/// </summary>
|
||||
/// <param name="output"></param>
|
||||
public class ToScreenTests (ITestOutputHelper output)
|
||||
{
|
||||
private readonly ITestOutputHelper _output = output;
|
||||
|
||||
[Theory]
|
||||
[InlineData (0, 0)]
|
||||
[InlineData (1, 1)]
|
||||
[InlineData (-1, -1)]
|
||||
[InlineData (11, 11)]
|
||||
public void FrameToScreen_NoSuperView_WithoutAdornments (int x, int expectedX)
|
||||
{
|
||||
// We test with only X because Y is equivalent. Height/Width are irrelevant.
|
||||
// Arrange
|
||||
var frame = new Rectangle (x, 0, 10, 10);
|
||||
|
||||
var view = new View ();
|
||||
view.Frame = frame;
|
||||
|
||||
// Act
|
||||
var screen = view.FrameToScreen();
|
||||
|
||||
// Assert
|
||||
Assert.Equal(expectedX, screen.X);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData (0, 0)]
|
||||
[InlineData (1, 1)]
|
||||
[InlineData (-1, -1)]
|
||||
[InlineData (11, 11)]
|
||||
public void FrameToScreen_NoSuperView_WithAdornments (int x, int expectedX)
|
||||
{
|
||||
// We test with only X because Y is equivalent. Height/Width are irrelevant.
|
||||
// Arrange
|
||||
var frame = new Rectangle (x, 0, 10, 10);
|
||||
|
||||
var view = new View ();
|
||||
view.BorderStyle = LineStyle.Single;
|
||||
view.Frame = frame;
|
||||
|
||||
// Act
|
||||
var screen = view.FrameToScreen ();
|
||||
|
||||
// Assert
|
||||
Assert.Equal (expectedX, screen.X);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData (0, 0)]
|
||||
[InlineData (1, 1)]
|
||||
[InlineData (-1, -1)]
|
||||
[InlineData (11, 11)]
|
||||
public void FrameToScreen_SuperView_WithoutAdornments (int x, int expectedX)
|
||||
{
|
||||
// We test with only X because Y is equivalent. Height/Width are irrelevant.
|
||||
// Arrange
|
||||
var frame = new Rectangle (x, 0, 10, 10);
|
||||
|
||||
var superView = new View ()
|
||||
{
|
||||
X = 0,
|
||||
Y = 0,
|
||||
Height = Dim.Fill (),
|
||||
Width = Dim.Fill ()
|
||||
};
|
||||
|
||||
var view = new View ();
|
||||
view.Frame = frame;
|
||||
|
||||
superView.Add (view);
|
||||
superView.LayoutSubviews ();
|
||||
|
||||
// Act
|
||||
var screen = view.FrameToScreen ();
|
||||
|
||||
// Assert
|
||||
Assert.Equal (expectedX, screen.X);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData (0, 1)]
|
||||
[InlineData (1, 2)]
|
||||
[InlineData (-1, 0)]
|
||||
[InlineData (11, 12)]
|
||||
public void FrameToScreen_SuperView_WithAdornments (int x, int expectedX)
|
||||
{
|
||||
// We test with only X because Y is equivalent. Height/Width are irrelevant.
|
||||
// Arrange
|
||||
var frame = new Rectangle (x, 0, 10, 10);
|
||||
|
||||
var superView = new View ()
|
||||
{
|
||||
X = 0,
|
||||
Y = 0,
|
||||
Height = Dim.Fill (),
|
||||
Width = Dim.Fill ()
|
||||
};
|
||||
superView.BorderStyle = LineStyle.Single;
|
||||
|
||||
var view = new View ();
|
||||
view.Frame = frame;
|
||||
|
||||
superView.Add (view);
|
||||
superView.LayoutSubviews ();
|
||||
|
||||
// Act
|
||||
var screen = view.FrameToScreen ();
|
||||
|
||||
// Assert
|
||||
Assert.Equal (expectedX, screen.X);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData (0, 0)]
|
||||
[InlineData (1, 1)]
|
||||
[InlineData (-1, -1)]
|
||||
[InlineData (11, 11)]
|
||||
public void FrameToScreen_NestedSuperView_WithoutAdornments (int x, int expectedX)
|
||||
{
|
||||
// We test with only X because Y is equivalent. Height/Width are irrelevant.
|
||||
// Arrange
|
||||
var frame = new Rectangle (x, 0, 10, 10);
|
||||
|
||||
var superSuperView = new View ()
|
||||
{
|
||||
X = 0,
|
||||
Y = 0,
|
||||
Height = Dim.Fill (),
|
||||
Width = Dim.Fill ()
|
||||
};
|
||||
|
||||
var superView = new View ()
|
||||
{
|
||||
X = 0,
|
||||
Y = 0,
|
||||
Height = Dim.Fill (),
|
||||
Width = Dim.Fill ()
|
||||
};
|
||||
|
||||
superSuperView.Add (superView);
|
||||
|
||||
var view = new View ();
|
||||
view.Frame = frame;
|
||||
|
||||
superView.Add (view);
|
||||
superView.LayoutSubviews ();
|
||||
|
||||
// Act
|
||||
var screen = view.FrameToScreen ();
|
||||
|
||||
// Assert
|
||||
Assert.Equal (expectedX, screen.X);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData (0, 2)]
|
||||
[InlineData (1, 3)]
|
||||
[InlineData (-1, 1)]
|
||||
[InlineData (11, 13)]
|
||||
public void FrameToScreen_NestedSuperView_WithAdornments (int x, int expectedX)
|
||||
{
|
||||
// We test with only X because Y is equivalent. Height/Width are irrelevant.
|
||||
// Arrange
|
||||
var frame = new Rectangle (x, 0, 10, 10);
|
||||
|
||||
var superSuperView = new View ()
|
||||
{
|
||||
X = 0,
|
||||
Y = 0,
|
||||
Height = Dim.Fill (),
|
||||
Width = Dim.Fill ()
|
||||
};
|
||||
superSuperView.BorderStyle = LineStyle.Single;
|
||||
|
||||
var superView = new View ()
|
||||
{
|
||||
X = 0,
|
||||
Y = 0,
|
||||
Height = Dim.Fill (),
|
||||
Width = Dim.Fill ()
|
||||
};
|
||||
|
||||
superSuperView.Add (superView);
|
||||
superView.BorderStyle = LineStyle.Single;
|
||||
|
||||
var view = new View ();
|
||||
view.Frame = frame;
|
||||
|
||||
superView.Add (view);
|
||||
superView.LayoutSubviews ();
|
||||
|
||||
// Act
|
||||
var screen = view.FrameToScreen ();
|
||||
|
||||
// Assert
|
||||
Assert.Equal (expectedX, screen.X);
|
||||
}
|
||||
|
||||
|
||||
|
||||
[Theory]
|
||||
[InlineData (0, 0, 0)]
|
||||
[InlineData (1, 0, 1)]
|
||||
[InlineData (-1, 0, -1)]
|
||||
[InlineData (11, 0, 11)]
|
||||
public void BoundsToScreen_NoSuperView_WithoutAdornments (int frameX, int boundsX, int expectedX)
|
||||
{
|
||||
// We test with only X because Y is equivalent. Height/Width are irrelevant.
|
||||
// Arrange
|
||||
var frame = new Rectangle (frameX, 0, 10, 10);
|
||||
|
||||
var view = new View ();
|
||||
view.Frame = frame;
|
||||
|
||||
// Act
|
||||
var screen = view.BoundsToScreen (new (boundsX, 0, 0, 0));
|
||||
|
||||
// Assert
|
||||
Assert.Equal (expectedX, screen.X);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData (0, 0, 1)]
|
||||
[InlineData (1, 0, 2)]
|
||||
[InlineData (-1, 0, 0)]
|
||||
[InlineData (11, 0, 12)]
|
||||
|
||||
[InlineData (0, 1, 2)]
|
||||
[InlineData (1, 1, 3)]
|
||||
[InlineData (-1, 1, 1)]
|
||||
[InlineData (11, 1, 13)]
|
||||
|
||||
[InlineData (0, -1, 0)]
|
||||
[InlineData (1, -1, 1)]
|
||||
[InlineData (-1, -1, -1)]
|
||||
[InlineData (11, -1, 11)]
|
||||
public void BoundsToScreen_NoSuperView_WithAdornments (int frameX, int boundsX, int expectedX)
|
||||
{
|
||||
// We test with only X because Y is equivalent. Height/Width are irrelevant.
|
||||
// Arrange
|
||||
var frame = new Rectangle (frameX, 0, 10, 10);
|
||||
|
||||
var view = new View ();
|
||||
view.BorderStyle = LineStyle.Single;
|
||||
view.Frame = frame;
|
||||
|
||||
// Act
|
||||
var screen = view.BoundsToScreen (new (boundsX, 0, 0, 0));
|
||||
|
||||
// Assert
|
||||
Assert.Equal (expectedX, screen.X);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData (0, 0, 0)]
|
||||
[InlineData (1, 0, 1)]
|
||||
[InlineData (-1, 0, -1)]
|
||||
[InlineData (11, 0, 11)]
|
||||
|
||||
[InlineData (0, 1, 1)]
|
||||
[InlineData (1, 1, 2)]
|
||||
[InlineData (-1, 1, 0)]
|
||||
[InlineData (11, 1, 12)]
|
||||
|
||||
[InlineData (0, -1, -1)]
|
||||
[InlineData (1, -1, 0)]
|
||||
[InlineData (-1, -1, -2)]
|
||||
[InlineData (11, -1, 10)]
|
||||
public void BoundsToScreen_SuperView_WithoutAdornments (int frameX, int boundsX, int expectedX)
|
||||
{
|
||||
// We test with only X because Y is equivalent. Height/Width are irrelevant.
|
||||
// Arrange
|
||||
var frame = new Rectangle (frameX, 0, 10, 10);
|
||||
|
||||
var superView = new View ()
|
||||
{
|
||||
X = 0,
|
||||
Y = 0,
|
||||
Height = Dim.Fill (),
|
||||
Width = Dim.Fill ()
|
||||
};
|
||||
|
||||
var view = new View ();
|
||||
view.Frame = frame;
|
||||
|
||||
superView.Add (view);
|
||||
superView.LayoutSubviews ();
|
||||
|
||||
// Act
|
||||
var screen = view.BoundsToScreen (new (boundsX, 0, 0, 0));
|
||||
|
||||
// Assert
|
||||
Assert.Equal (expectedX, screen.X);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData (0, 0, 1)]
|
||||
[InlineData (1, 0, 2)]
|
||||
[InlineData (-1, 0, 0)]
|
||||
[InlineData (11, 0, 12)]
|
||||
|
||||
[InlineData (0, 1, 2)]
|
||||
[InlineData (1, 1, 3)]
|
||||
[InlineData (-1, 1, 1)]
|
||||
[InlineData (11, 1, 13)]
|
||||
|
||||
[InlineData (0, -1, 0)]
|
||||
[InlineData (1, -1, 1)]
|
||||
[InlineData (-1, -1, -1)]
|
||||
[InlineData (11, -1, 11)]
|
||||
public void BoundsToScreen_SuperView_WithAdornments (int frameX, int boundsX, int expectedX)
|
||||
{
|
||||
// We test with only X because Y is equivalent. Height/Width are irrelevant.
|
||||
// Arrange
|
||||
var frame = new Rectangle (frameX, 0, 10, 10);
|
||||
|
||||
var superView = new View ()
|
||||
{
|
||||
X = 0,
|
||||
Y = 0,
|
||||
Height = Dim.Fill (),
|
||||
Width = Dim.Fill ()
|
||||
};
|
||||
superView.BorderStyle = LineStyle.Single;
|
||||
|
||||
var view = new View ();
|
||||
view.Frame = frame;
|
||||
|
||||
superView.Add (view);
|
||||
superView.LayoutSubviews ();
|
||||
|
||||
// Act
|
||||
var screen = view.BoundsToScreen (new (boundsX, 0, 0, 0));
|
||||
|
||||
// Assert
|
||||
Assert.Equal (expectedX, screen.X);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData (0, 0, 0)]
|
||||
[InlineData (1, 0, 1)]
|
||||
[InlineData (-1, 0, -1)]
|
||||
[InlineData (11, 0, 11)]
|
||||
|
||||
[InlineData (0, 1, 1)]
|
||||
[InlineData (1, 1, 2)]
|
||||
[InlineData (-1, 1, 0)]
|
||||
[InlineData (11, 1, 12)]
|
||||
|
||||
[InlineData (0, -1, -1)]
|
||||
[InlineData (1, -1, 0)]
|
||||
[InlineData (-1, -1, -2)]
|
||||
[InlineData (11, -1, 10)]
|
||||
public void BoundsToScreen_NestedSuperView_WithoutAdornments (int frameX, int boundsX, int expectedX)
|
||||
{
|
||||
// We test with only X because Y is equivalent. Height/Width are irrelevant.
|
||||
// Arrange
|
||||
var frame = new Rectangle (frameX, 0, 10, 10);
|
||||
|
||||
var superSuperView = new View ()
|
||||
{
|
||||
X = 0,
|
||||
Y = 0,
|
||||
Height = Dim.Fill (),
|
||||
Width = Dim.Fill ()
|
||||
};
|
||||
|
||||
var superView = new View ()
|
||||
{
|
||||
X = 0,
|
||||
Y = 0,
|
||||
Height = Dim.Fill (),
|
||||
Width = Dim.Fill ()
|
||||
};
|
||||
|
||||
superSuperView.Add (superView);
|
||||
|
||||
var view = new View ();
|
||||
view.Frame = frame;
|
||||
|
||||
superView.Add (view);
|
||||
superView.LayoutSubviews ();
|
||||
|
||||
// Act
|
||||
var screen = view.BoundsToScreen (new (boundsX, 0, 0, 0));
|
||||
|
||||
// Assert
|
||||
Assert.Equal (expectedX, screen.X);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData (0, 0, 2)]
|
||||
[InlineData (1, 0, 3)]
|
||||
[InlineData (-1, 0, 1)]
|
||||
[InlineData (11, 0, 13)]
|
||||
|
||||
[InlineData (0, 1, 3)]
|
||||
[InlineData (1, 1, 4)]
|
||||
[InlineData (-1, 1, 2)]
|
||||
[InlineData (11, 1, 14)]
|
||||
|
||||
[InlineData (0, -1, 1)]
|
||||
[InlineData (1, -1, 2)]
|
||||
[InlineData (-1, -1, 0)]
|
||||
[InlineData (11, -1, 12)]
|
||||
public void BoundsToScreen_NestedSuperView_WithAdornments (int frameX, int boundsX, int expectedX)
|
||||
{
|
||||
// We test with only X because Y is equivalent. Height/Width are irrelevant.
|
||||
// Arrange
|
||||
var frame = new Rectangle (frameX, 0, 10, 10);
|
||||
|
||||
var superSuperView = new View ()
|
||||
{
|
||||
X = 0,
|
||||
Y = 0,
|
||||
Height = Dim.Fill (),
|
||||
Width = Dim.Fill ()
|
||||
};
|
||||
superSuperView.BorderStyle = LineStyle.Single;
|
||||
|
||||
var superView = new View ()
|
||||
{
|
||||
X = 0,
|
||||
Y = 0,
|
||||
Height = Dim.Fill (),
|
||||
Width = Dim.Fill ()
|
||||
};
|
||||
|
||||
superSuperView.Add (superView);
|
||||
superView.BorderStyle = LineStyle.Single;
|
||||
|
||||
var view = new View ();
|
||||
view.Frame = frame;
|
||||
|
||||
superView.Add (view);
|
||||
superView.LayoutSubviews ();
|
||||
|
||||
// Act
|
||||
var screen = view.BoundsToScreen (new (boundsX, 0, 0, 0));
|
||||
|
||||
// Assert
|
||||
Assert.Equal (expectedX, screen.X);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user