|
|
@@ -25,61 +25,62 @@ public class DimTests
|
|
|
}
|
|
|
|
|
|
[Fact]
|
|
|
- public void DimAbsolute_GetDimension_ReturnsCorrectValue ()
|
|
|
+ public void DimAbsolute_Calculate_ReturnsCorrectValue ()
|
|
|
{
|
|
|
var dim = new DimAbsolute (10);
|
|
|
- var result = dim.Calculate (0, 100, 50, false);
|
|
|
+ var result = dim.Calculate (0, 100, null, Dim.Dimension.None);
|
|
|
Assert.Equal (10, result);
|
|
|
}
|
|
|
|
|
|
[Fact]
|
|
|
- public void DimCombine_GetDimension_ReturnsCorrectValue ()
|
|
|
+ public void DimCombine_Calculate_ReturnsCorrectValue ()
|
|
|
{
|
|
|
var dim1 = new DimAbsolute (10);
|
|
|
var dim2 = new DimAbsolute (20);
|
|
|
var dim = dim1 + dim2;
|
|
|
- var result = dim.Calculate (0, 100, 50, false);
|
|
|
+ var result = dim.Calculate (0, 100, null, Dim.Dimension.None);
|
|
|
Assert.Equal (30, result);
|
|
|
}
|
|
|
|
|
|
[Fact]
|
|
|
- public void DimFactor_GetDimension_ReturnsCorrectValue ()
|
|
|
+ public void DimFactor_Calculate_ReturnsCorrectValue ()
|
|
|
{
|
|
|
var dim = new DimFactor (0.5f);
|
|
|
- var result = dim.Calculate (0, 100, 50, false);
|
|
|
+ var result = dim.Calculate (0, 100, null, Dim.Dimension.None);
|
|
|
Assert.Equal (50, result);
|
|
|
}
|
|
|
|
|
|
[Fact]
|
|
|
- public void DimFill_GetDimension_ReturnsCorrectValue ()
|
|
|
+ public void DimFill_Calculate_ReturnsCorrectValue ()
|
|
|
{
|
|
|
var dim = Dim.Fill ();
|
|
|
- var result = dim.Calculate (0, 100, 50, false);
|
|
|
+ var result = dim.Calculate (0, 100, null, Dim.Dimension.None);
|
|
|
Assert.Equal (100, result);
|
|
|
}
|
|
|
|
|
|
[Fact]
|
|
|
- public void DimFunc_GetDimension_ReturnsCorrectValue ()
|
|
|
+ public void DimFunc_Calculate_ReturnsCorrectValue ()
|
|
|
{
|
|
|
var dim = new DimFunc (() => 10);
|
|
|
- var result = dim.Calculate (0, 100, 50, false);
|
|
|
+ var result = dim.Calculate (0, 100, null, Dim.Dimension.None);
|
|
|
Assert.Equal (10, result);
|
|
|
}
|
|
|
|
|
|
[Fact]
|
|
|
- public void DimView_GetDimension_ReturnsCorrectValue ()
|
|
|
+ public void DimView_Calculate_ReturnsCorrectValue ()
|
|
|
{
|
|
|
var view = new View { Width = 10 };
|
|
|
var dim = new DimView (view, Dimension.Width);
|
|
|
- var result = dim.Calculate (0, 100, 50, false);
|
|
|
+ var result = dim.Calculate (0, 100, null, Dim.Dimension.None);
|
|
|
Assert.Equal (10, result);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
// TODO: This actually a SetRelativeLayout/LayoutSubViews test and should be moved
|
|
|
// A new test that does not depend on Application is needed.
|
|
|
[Fact]
|
|
|
[AutoInitShutdown]
|
|
|
- public void Dim_Add_Operator ()
|
|
|
+ public void Add_Operator ()
|
|
|
{
|
|
|
Toplevel top = new ();
|
|
|
|
|
|
@@ -372,7 +373,7 @@ public class DimTests
|
|
|
/// <summary>This is an intentionally obtuse test. See https://github.com/gui-cs/Terminal.Gui/issues/2461</summary>
|
|
|
[Fact]
|
|
|
[TestRespondersDisposed]
|
|
|
- public void DimCombine_ObtuseScenario_Throw_If_SuperView_Refs_SubView ()
|
|
|
+ public void Combine_ObtuseScenario_Throw_If_SuperView_Refs_SubView ()
|
|
|
{
|
|
|
var t = new View { Width = 80, Height = 25 };
|
|
|
|
|
|
@@ -420,55 +421,159 @@ public class DimTests
|
|
|
|
|
|
// TODO: This actually a SetRelativeLayout/LayoutSubViews test and should be moved
|
|
|
// TODO: A new test that calls SetRelativeLayout directly is needed.
|
|
|
+ [Fact]
|
|
|
+ [TestRespondersDisposed]
|
|
|
+ public void Combine_View_Not_Added_Throws ()
|
|
|
+ {
|
|
|
+ var t = new View { Width = 80, Height = 50 };
|
|
|
+
|
|
|
+ var super = new View { Width = Dim.Width (t) - 2, Height = Dim.Height (t) - 2 };
|
|
|
+ t.Add (super);
|
|
|
+
|
|
|
+ var sub = new View ();
|
|
|
+ super.Add (sub);
|
|
|
+
|
|
|
+ var v1 = new View { Width = Dim.Width (super) - 2, Height = Dim.Height (super) - 2 };
|
|
|
+ var v2 = new View { Width = Dim.Width (v1) - 2, Height = Dim.Height (v1) - 2 };
|
|
|
+ sub.Add (v1);
|
|
|
+
|
|
|
+ // v2 not added to sub; should cause exception on Layout since it's referenced by sub.
|
|
|
+ sub.Width = Dim.Fill () - Dim.Width (v2);
|
|
|
+ sub.Height = Dim.Fill () - Dim.Height (v2);
|
|
|
+
|
|
|
+ t.BeginInit ();
|
|
|
+ t.EndInit ();
|
|
|
+
|
|
|
+ Assert.Throws<InvalidOperationException> (() => t.LayoutSubviews ());
|
|
|
+ t.Dispose ();
|
|
|
+ v2.Dispose ();
|
|
|
+ }
|
|
|
+
|
|
|
+ // TODO: This actually a SetRelativeLayout/LayoutSubViews test and should be moved
|
|
|
+ // TODO: A new test that calls SetRelativeLayout directly is needed.
|
|
|
+ [Fact]
|
|
|
+ [TestRespondersDisposed]
|
|
|
+ public void
|
|
|
+ Dim_Validation_Does_Not_Throw_If_NewValue_Is_DimAbsolute_And_OldValue_Is_Another_Type_After_Sets_To_LayoutStyle_Absolute ()
|
|
|
+ {
|
|
|
+ var t = new View { Width = 80, Height = 25, Text = "top" };
|
|
|
+
|
|
|
+ var w = new Window { Width = Dim.Fill (), Height = Dim.Sized (10) };
|
|
|
+ var v = new View { Width = Dim.Width (w) - 2, Height = Dim.Percent (10), Text = "v" };
|
|
|
+
|
|
|
+ w.Add (v);
|
|
|
+ t.Add (w);
|
|
|
+
|
|
|
+ Assert.Equal (LayoutStyle.Absolute, t.LayoutStyle);
|
|
|
+ Assert.Equal (LayoutStyle.Computed, w.LayoutStyle);
|
|
|
+ Assert.Equal (LayoutStyle.Computed, v.LayoutStyle);
|
|
|
+
|
|
|
+ t.LayoutSubviews ();
|
|
|
+ Assert.Equal (2, v.Width = 2);
|
|
|
+ Assert.Equal (2, v.Height = 2);
|
|
|
+
|
|
|
+ // Force v to be LayoutStyle.Absolute;
|
|
|
+ v.Frame = new Rectangle (0, 1, 3, 4);
|
|
|
+ Assert.Equal (LayoutStyle.Absolute, v.LayoutStyle);
|
|
|
+ t.LayoutSubviews ();
|
|
|
+
|
|
|
+ Assert.Equal (2, v.Width = 2);
|
|
|
+ Assert.Equal (2, v.Height = 2);
|
|
|
+ t.Dispose ();
|
|
|
+ }
|
|
|
+
|
|
|
+ [Fact]
|
|
|
+ public void Fill_Equal ()
|
|
|
+ {
|
|
|
+ var margin1 = 0;
|
|
|
+ var margin2 = 0;
|
|
|
+ Dim dim1 = Dim.Fill (margin1);
|
|
|
+ Dim dim2 = Dim.Fill (margin2);
|
|
|
+ Assert.Equal (dim1, dim2);
|
|
|
+ }
|
|
|
+
|
|
|
+ // Tests that Dim.Fill honors the margin parameter correctly
|
|
|
[Theory]
|
|
|
- [AutoInitShutdown]
|
|
|
- [InlineData (0, true)]
|
|
|
- [InlineData (0, false)]
|
|
|
- [InlineData (50, true)]
|
|
|
- [InlineData (50, false)]
|
|
|
- public void DimPercentPlusOne (int startingDistance, bool testHorizontal)
|
|
|
+ [InlineData (0, true, 25)]
|
|
|
+ [InlineData (0, false, 25)]
|
|
|
+ [InlineData (1, true, 24)]
|
|
|
+ [InlineData (1, false, 24)]
|
|
|
+ [InlineData (2, true, 23)]
|
|
|
+ [InlineData (2, false, 23)]
|
|
|
+ [InlineData (-2, true, 27)]
|
|
|
+ [InlineData (-2, false, 27)]
|
|
|
+ public void Fill_Margin (int margin, bool width, int expected)
|
|
|
{
|
|
|
- var container = new View { Width = 100, Height = 100 };
|
|
|
+ var super = new View { Width = 25, Height = 25 };
|
|
|
|
|
|
- var label = new Label
|
|
|
+ var view = new View
|
|
|
{
|
|
|
- AutoSize = false,
|
|
|
- X = testHorizontal ? startingDistance : 0,
|
|
|
- Y = testHorizontal ? 0 : startingDistance,
|
|
|
- Width = testHorizontal ? Dim.Percent (50) + 1 : 1,
|
|
|
- Height = testHorizontal ? 1 : Dim.Percent (50) + 1
|
|
|
+ X = 0,
|
|
|
+ Y = 0,
|
|
|
+ Width = width ? Dim.Fill (margin) : 1,
|
|
|
+ Height = width ? 1 : Dim.Fill (margin)
|
|
|
};
|
|
|
|
|
|
- container.Add (label);
|
|
|
- var top = new Toplevel ();
|
|
|
- top.Add (container);
|
|
|
- top.BeginInit ();
|
|
|
- top.EndInit ();
|
|
|
- top.LayoutSubviews ();
|
|
|
+ super.Add (view);
|
|
|
+ super.BeginInit ();
|
|
|
+ super.EndInit ();
|
|
|
+ super.LayoutSubviews ();
|
|
|
|
|
|
- Assert.Equal (100, container.Frame.Width);
|
|
|
- Assert.Equal (100, container.Frame.Height);
|
|
|
+ Assert.Equal (25, super.Frame.Width);
|
|
|
+ Assert.Equal (25, super.Frame.Height);
|
|
|
|
|
|
- if (testHorizontal)
|
|
|
+ if (width)
|
|
|
{
|
|
|
- Assert.Equal (51, label.Frame.Width);
|
|
|
- Assert.Equal (1, label.Frame.Height);
|
|
|
+ Assert.Equal (expected, view.Frame.Width);
|
|
|
+ Assert.Equal (1, view.Frame.Height);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- Assert.Equal (1, label.Frame.Width);
|
|
|
- Assert.Equal (51, label.Frame.Height);
|
|
|
+ Assert.Equal (1, view.Frame.Width);
|
|
|
+ Assert.Equal (expected, view.Frame.Height);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- [Fact]
|
|
|
- public void Fill_Equal ()
|
|
|
+ // Tests that Dim.Fill fills the dimension REMAINING from the View's X position to the end of the super view's width
|
|
|
+ [Theory]
|
|
|
+ [InlineData (0, true, 25)]
|
|
|
+ [InlineData (0, false, 25)]
|
|
|
+ [InlineData (1, true, 24)]
|
|
|
+ [InlineData (1, false, 24)]
|
|
|
+ [InlineData (2, true, 23)]
|
|
|
+ [InlineData (2, false, 23)]
|
|
|
+ [InlineData (-2, true, 27)]
|
|
|
+ [InlineData (-2, false, 27)]
|
|
|
+ public void Fill_Offset (int offset, bool width, int expected)
|
|
|
{
|
|
|
- var margin1 = 0;
|
|
|
- var margin2 = 0;
|
|
|
- Dim dim1 = Dim.Fill (margin1);
|
|
|
- Dim dim2 = Dim.Fill (margin2);
|
|
|
- Assert.Equal (dim1, dim2);
|
|
|
+ var super = new View { Width = 25, Height = 25 };
|
|
|
+
|
|
|
+ var view = new View
|
|
|
+ {
|
|
|
+ X = width ? offset : 0,
|
|
|
+ Y = width ? 0 : offset,
|
|
|
+ Width = width ? Dim.Fill () : 1,
|
|
|
+ Height = width ? 1 : Dim.Fill ()
|
|
|
+ };
|
|
|
+
|
|
|
+ super.Add (view);
|
|
|
+ super.BeginInit ();
|
|
|
+ super.EndInit ();
|
|
|
+ super.LayoutSubviews ();
|
|
|
+
|
|
|
+ Assert.Equal (25, super.Frame.Width);
|
|
|
+ Assert.Equal (25, super.Frame.Height);
|
|
|
+
|
|
|
+ if (width)
|
|
|
+ {
|
|
|
+ Assert.Equal (expected, view.Frame.Width);
|
|
|
+ Assert.Equal (1, view.Frame.Height);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ Assert.Equal (1, view.Frame.Width);
|
|
|
+ Assert.Equal (expected, view.Frame.Height);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
// TODO: Other Dim.Height tests (e.g. Equal?)
|
|
|
@@ -670,45 +775,45 @@ public class DimTests
|
|
|
|
|
|
t.Ready += (s, e) =>
|
|
|
{
|
|
|
- Assert.Equal ("Absolute(100)", w.Width.ToString ());
|
|
|
- Assert.Equal ("Absolute(100)", w.Height.ToString ());
|
|
|
- Assert.Equal (100, w.Frame.Width);
|
|
|
- Assert.Equal (100, w.Frame.Height);
|
|
|
-
|
|
|
- Assert.Equal ("Factor(0.5,False)", f1.Width.ToString ());
|
|
|
- Assert.Equal ("Absolute(5)", f1.Height.ToString ());
|
|
|
- Assert.Equal (49, f1.Frame.Width); // 50-1=49
|
|
|
- Assert.Equal (5, f1.Frame.Height);
|
|
|
-
|
|
|
- Assert.Equal ("Fill(0)", f2.Width.ToString ());
|
|
|
- Assert.Equal ("Absolute(5)", f2.Height.ToString ());
|
|
|
- Assert.Equal (49, f2.Frame.Width); // 50-1=49
|
|
|
- Assert.Equal (5, f2.Frame.Height);
|
|
|
-
|
|
|
- #if DEBUG
|
|
|
+ Assert.Equal ("Absolute(100)", w.Width.ToString ());
|
|
|
+ Assert.Equal ("Absolute(100)", w.Height.ToString ());
|
|
|
+ Assert.Equal (100, w.Frame.Width);
|
|
|
+ Assert.Equal (100, w.Frame.Height);
|
|
|
+
|
|
|
+ Assert.Equal ("Factor(0.5,False)", f1.Width.ToString ());
|
|
|
+ Assert.Equal ("Absolute(5)", f1.Height.ToString ());
|
|
|
+ Assert.Equal (49, f1.Frame.Width); // 50-1=49
|
|
|
+ Assert.Equal (5, f1.Frame.Height);
|
|
|
+
|
|
|
+ Assert.Equal ("Fill(0)", f2.Width.ToString ());
|
|
|
+ Assert.Equal ("Absolute(5)", f2.Height.ToString ());
|
|
|
+ Assert.Equal (49, f2.Frame.Width); // 50-1=49
|
|
|
+ Assert.Equal (5, f2.Frame.Height);
|
|
|
+
|
|
|
+#if DEBUG
|
|
|
Assert.Equal ($"Combine(View(Width,FrameView(f1){f1.Border.Frame})-Absolute(2))", v1.Width.ToString ());
|
|
|
- #else
|
|
|
+#else
|
|
|
Assert.Equal ($"Combine(View(Width,FrameView(){f1.Border.Frame})-Absolute(2))", v1.Width.ToString ());
|
|
|
- #endif
|
|
|
+#endif
|
|
|
Assert.Equal ("Combine(Fill(0)-Absolute(2))", v1.Height.ToString ());
|
|
|
Assert.Equal (47, v1.Frame.Width); // 49-2=47
|
|
|
Assert.Equal (89, v1.Frame.Height); // 98-5-2-2=89
|
|
|
|
|
|
- #if DEBUG
|
|
|
+#if DEBUG
|
|
|
Assert.Equal (
|
|
|
$"Combine(View(Width,FrameView(f2){f2.Frame})-Absolute(2))",
|
|
|
v2.Width.ToString ()
|
|
|
- #else
|
|
|
+#else
|
|
|
Assert.Equal (
|
|
|
$"Combine(View(Width,FrameView(){f2.Frame})-Absolute(2))",
|
|
|
v2.Width.ToString ()
|
|
|
- #endif
|
|
|
+#endif
|
|
|
);
|
|
|
- #if DEBUG
|
|
|
+#if DEBUG
|
|
|
Assert.Equal ("Combine(Fill(0)-Absolute(2))", v2.Height.ToString ());
|
|
|
- #else
|
|
|
+#else
|
|
|
Assert.Equal ("Combine(Fill(0)-Absolute(2))", v2.Height.ToString ());
|
|
|
- #endif
|
|
|
+#endif
|
|
|
Assert.Equal (47, v2.Frame.Width); // 49-2=47
|
|
|
Assert.Equal (89, v2.Frame.Height); // 98-5-2-2=89
|
|
|
|
|
|
@@ -757,22 +862,22 @@ public class DimTests
|
|
|
Assert.Equal (5, f2.Frame.Height);
|
|
|
|
|
|
v1.Text = "Button1";
|
|
|
- #if DEBUG
|
|
|
+#if DEBUG
|
|
|
Assert.Equal ($"Combine(View(Width,FrameView(f1){f1.Frame})-Absolute(2))", v1.Width.ToString ());
|
|
|
- #else
|
|
|
+#else
|
|
|
Assert.Equal ($"Combine(View(Width,FrameView(){f1.Frame})-Absolute(2))", v1.Width.ToString ());
|
|
|
- #endif
|
|
|
+#endif
|
|
|
Assert.Equal ("Combine(Fill(0)-Absolute(2))", v1.Height.ToString ());
|
|
|
Assert.Equal (97, v1.Frame.Width); // 99-2=97
|
|
|
Assert.Equal (189, v1.Frame.Height); // 198-2-7=189
|
|
|
|
|
|
v2.Text = "Button2";
|
|
|
|
|
|
- #if DEBUG
|
|
|
- Assert.Equal ( $"Combine(View(Width,FrameView(f2){f2.Frame})-Absolute(2))", v2.Width.ToString ());
|
|
|
- #else
|
|
|
+#if DEBUG
|
|
|
+ Assert.Equal ($"Combine(View(Width,FrameView(f2){f2.Frame})-Absolute(2))", v2.Width.ToString ());
|
|
|
+#else
|
|
|
Assert.Equal ($"Combine(View(Width,FrameView(){f2.Frame})-Absolute(2))", v2.Width.ToString ());
|
|
|
- #endif
|
|
|
+#endif
|
|
|
Assert.Equal ("Combine(Fill(0)-Absolute(2))", v2.Height.ToString ());
|
|
|
Assert.Equal (97, v2.Frame.Width); // 99-2=97
|
|
|
Assert.Equal (189, v2.Frame.Height); // 198-2-7=189
|
|
|
@@ -782,7 +887,7 @@ public class DimTests
|
|
|
Assert.Equal ("Factor(0.1,False)", v3.Height.ToString ());
|
|
|
|
|
|
// 198*10%=19 * Percent is related to the super-view if it isn't null otherwise the view width
|
|
|
- Assert.Equal (19, v3.Frame.Width );
|
|
|
+ Assert.Equal (19, v3.Frame.Width);
|
|
|
// 199*10%=19
|
|
|
Assert.Equal (19, v3.Frame.Height);
|
|
|
|
|
|
@@ -793,20 +898,20 @@ public class DimTests
|
|
|
Assert.Equal (50, v4.Frame.Width);
|
|
|
Assert.Equal (50, v4.Frame.Height);
|
|
|
v4.AutoSize = true;
|
|
|
- Assert.Equal ("Absolute(11)", v4.Width.ToString ());
|
|
|
- Assert.Equal ("Absolute(1)", v4.Height.ToString ());
|
|
|
+ Assert.Equal (Dim.Auto (DimAutoStyle.Text), v4.Width);
|
|
|
+ Assert.Equal (Dim.Auto (DimAutoStyle.Text), v4.Height);
|
|
|
Assert.Equal (11, v4.Frame.Width); // 11 is the text length and because is Dim.DimAbsolute
|
|
|
Assert.Equal (1, v4.Frame.Height); // 1 because is Dim.DimAbsolute
|
|
|
|
|
|
v5.Text = "Button5";
|
|
|
|
|
|
- #if DEBUG
|
|
|
+#if DEBUG
|
|
|
Assert.Equal ($"Combine(View(Width,Button(v1){v1.Frame})-View(Width,Button(v3){v3.Frame}))", v5.Width.ToString ());
|
|
|
Assert.Equal ($"Combine(View(Height,Button(v1){v1.Frame})-View(Height,Button(v3){v3.Frame}))", v5.Height.ToString ());
|
|
|
- #else
|
|
|
+#else
|
|
|
Assert.Equal ($"Combine(View(Width,Button(){v1.Frame})-View(Width,Button(){v3.Frame}))", v5.Width.ToString ());
|
|
|
Assert.Equal ($"Combine(View(Height,Button(){v1.Frame})-View(Height,Button(){v3.Frame}))", v5.Height.ToString ());
|
|
|
- #endif
|
|
|
+#endif
|
|
|
|
|
|
Assert.Equal (78, v5.Frame.Width); // 97-9=78
|
|
|
Assert.Equal (170, v5.Frame.Height); // 189-19=170
|
|
|
@@ -880,6 +985,89 @@ public class DimTests
|
|
|
Assert.Throws<ArgumentException> (() => dim = Dim.Percent (1000001));
|
|
|
}
|
|
|
|
|
|
+ [Theory]
|
|
|
+ [InlineData (0, false, true, 12)]
|
|
|
+ [InlineData (0, false, false, 12)]
|
|
|
+ [InlineData (1, false, true, 12)]
|
|
|
+ [InlineData (1, false, false, 12)]
|
|
|
+ [InlineData (2, false, true, 12)]
|
|
|
+ [InlineData (2, false, false, 12)]
|
|
|
+
|
|
|
+ [InlineData (0, true, true, 12)]
|
|
|
+ [InlineData (0, true, false, 12)]
|
|
|
+ [InlineData (1, true, true, 12)]
|
|
|
+ [InlineData (1, true, false, 12)]
|
|
|
+ [InlineData (2, true, true, 11)]
|
|
|
+ [InlineData (2, true, false, 11)]
|
|
|
+ public void Percent_Position (int position, bool usePosition, bool width, int expected)
|
|
|
+ {
|
|
|
+ var super = new View { Width = 25, Height = 25 };
|
|
|
+
|
|
|
+ var view = new View
|
|
|
+ {
|
|
|
+ X = width ? position : 0,
|
|
|
+ Y = width ? 0 : position,
|
|
|
+ Width = width ? Dim.Percent (50, usePosition) : 1,
|
|
|
+ Height = width ? 1 : Dim.Percent (50, usePosition)
|
|
|
+ };
|
|
|
+
|
|
|
+ super.Add (view);
|
|
|
+ super.BeginInit ();
|
|
|
+ super.EndInit ();
|
|
|
+ super.LayoutSubviews ();
|
|
|
+
|
|
|
+ Assert.Equal (25, super.Frame.Width);
|
|
|
+ Assert.Equal (25, super.Frame.Height);
|
|
|
+
|
|
|
+ if (width)
|
|
|
+ {
|
|
|
+ Assert.Equal (expected, view.Frame.Width);
|
|
|
+ Assert.Equal (1, view.Frame.Height);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ Assert.Equal (1, view.Frame.Width);
|
|
|
+ Assert.Equal (expected, view.Frame.Height);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ [Theory]
|
|
|
+ [InlineData (0, true)]
|
|
|
+ [InlineData (0, false)]
|
|
|
+ [InlineData (50, true)]
|
|
|
+ [InlineData (50, false)]
|
|
|
+ public void Percent_PlusOne (int startingDistance, bool testHorizontal)
|
|
|
+ {
|
|
|
+ var super = new View { Width = 100, Height = 100 };
|
|
|
+
|
|
|
+ var view = new View
|
|
|
+ {
|
|
|
+ X = testHorizontal ? startingDistance : 0,
|
|
|
+ Y = testHorizontal ? 0 : startingDistance,
|
|
|
+ Width = testHorizontal ? Dim.Percent (50) + 1 : 1,
|
|
|
+ Height = testHorizontal ? 1 : Dim.Percent (50) + 1
|
|
|
+ };
|
|
|
+
|
|
|
+ super.Add (view);
|
|
|
+ super.BeginInit ();
|
|
|
+ super.EndInit ();
|
|
|
+ super.LayoutSubviews ();
|
|
|
+
|
|
|
+ Assert.Equal (100, super.Frame.Width);
|
|
|
+ Assert.Equal (100, super.Frame.Height);
|
|
|
+
|
|
|
+ if (testHorizontal)
|
|
|
+ {
|
|
|
+ Assert.Equal (51, view.Frame.Width);
|
|
|
+ Assert.Equal (1, view.Frame.Height);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ Assert.Equal (1, view.Frame.Width);
|
|
|
+ Assert.Equal (51, view.Frame.Height);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
[Fact]
|
|
|
public void Percent_SetsValue ()
|
|
|
{
|
|
|
@@ -898,47 +1086,24 @@ public class DimTests
|
|
|
// TODO: A new test that calls SetRelativeLayout directly is needed.
|
|
|
[Fact]
|
|
|
[TestRespondersDisposed]
|
|
|
- public void PosCombine_View_Not_Added_Throws ()
|
|
|
+ public void Referencing_SuperView_Does_Not_Throw ()
|
|
|
{
|
|
|
- var t = new View { Width = 80, Height = 50 };
|
|
|
-
|
|
|
- var super = new View { Width = Dim.Width (t) - 2, Height = Dim.Height (t) - 2 };
|
|
|
- t.Add (super);
|
|
|
-
|
|
|
- var sub = new View ();
|
|
|
- super.Add (sub);
|
|
|
-
|
|
|
- var v1 = new View { Width = Dim.Width (super) - 2, Height = Dim.Height (super) - 2 };
|
|
|
- var v2 = new View { Width = Dim.Width (v1) - 2, Height = Dim.Height (v1) - 2 };
|
|
|
- sub.Add (v1);
|
|
|
-
|
|
|
- // v2 not added to sub; should cause exception on Layout since it's referenced by sub.
|
|
|
- sub.Width = Dim.Fill () - Dim.Width (v2);
|
|
|
- sub.Height = Dim.Fill () - Dim.Height (v2);
|
|
|
-
|
|
|
- t.BeginInit ();
|
|
|
- t.EndInit ();
|
|
|
+ var super = new View { Width = 10, Height = 10, Text = "super" };
|
|
|
|
|
|
- Assert.Throws<InvalidOperationException> (() => t.LayoutSubviews ());
|
|
|
- t.Dispose ();
|
|
|
- v2.Dispose ();
|
|
|
- }
|
|
|
+ var view = new View
|
|
|
+ {
|
|
|
+ Width = Dim.Width (super), // this is allowed
|
|
|
+ Height = Dim.Height (super), // this is allowed
|
|
|
+ Text = "view"
|
|
|
+ };
|
|
|
|
|
|
- [Fact]
|
|
|
- [TestRespondersDisposed]
|
|
|
- public void SetsValue ()
|
|
|
- {
|
|
|
- var testVal = Rectangle.Empty;
|
|
|
- var testValView = new View { Frame = testVal };
|
|
|
- Dim dim = Dim.Width (testValView);
|
|
|
- Assert.Equal ($"View(Width,View(){testVal})", dim.ToString ());
|
|
|
- testValView.Dispose ();
|
|
|
+ super.Add (view);
|
|
|
+ super.BeginInit ();
|
|
|
+ super.EndInit ();
|
|
|
|
|
|
- testVal = new Rectangle (1, 2, 3, 4);
|
|
|
- testValView = new View { Frame = testVal };
|
|
|
- dim = Dim.Width (testValView);
|
|
|
- Assert.Equal ($"View(Width,View(){testVal})", dim.ToString ());
|
|
|
- testValView.Dispose ();
|
|
|
+ Exception exception = Record.Exception (super.LayoutSubviews);
|
|
|
+ Assert.Null (exception);
|
|
|
+ super.Dispose ();
|
|
|
}
|
|
|
|
|
|
[Fact]
|
|
|
@@ -982,6 +1147,119 @@ public class DimTests
|
|
|
Assert.Equal ($"Absolute({testVal})", dim.ToString ());
|
|
|
}
|
|
|
|
|
|
+ // TODO: This actually a SetRelativeLayout/LayoutSubViews test and should be moved
|
|
|
+ // TODO: A new test that calls SetRelativeLayout directly is needed.
|
|
|
+ [Fact]
|
|
|
+ [AutoInitShutdown]
|
|
|
+ public void Subtract_Operator ()
|
|
|
+ {
|
|
|
+ Toplevel top = new Toplevel ();
|
|
|
+
|
|
|
+ var view = new View { X = 0, Y = 0, Width = 20, Height = 0 };
|
|
|
+ var field = new TextField { X = 0, Y = Pos.Bottom (view), Width = 20 };
|
|
|
+ var count = 20;
|
|
|
+ List<Label> listLabels = new ();
|
|
|
+
|
|
|
+ for (var i = 0; i < count; i++)
|
|
|
+ {
|
|
|
+ field.Text = $"Label {i}";
|
|
|
+ var label = new Label { X = 0, Y = view.Viewport.Height, /*Width = 20,*/ Text = field.Text };
|
|
|
+ view.Add (label);
|
|
|
+ Assert.Equal ($"Label {i}", label.Text);
|
|
|
+ Assert.Equal ($"Absolute({i})", label.Y.ToString ());
|
|
|
+ listLabels.Add (label);
|
|
|
+
|
|
|
+ Assert.Equal ($"Absolute({i})", view.Height.ToString ());
|
|
|
+ view.Height += 1;
|
|
|
+ Assert.Equal ($"Absolute({i + 1})", view.Height.ToString ());
|
|
|
+ }
|
|
|
+
|
|
|
+ field.KeyDown += (s, k) =>
|
|
|
+ {
|
|
|
+ if (k.KeyCode == KeyCode.Enter)
|
|
|
+ {
|
|
|
+ Assert.Equal ($"Label {count - 1}", listLabels [count - 1].Text);
|
|
|
+ view.Remove (listLabels [count - 1]);
|
|
|
+ listLabels [count - 1].Dispose ();
|
|
|
+
|
|
|
+ Assert.Equal ($"Absolute({count})", view.Height.ToString ());
|
|
|
+ view.Height -= 1;
|
|
|
+ count--;
|
|
|
+ Assert.Equal ($"Absolute({count})", view.Height.ToString ());
|
|
|
+ }
|
|
|
+ };
|
|
|
+
|
|
|
+ Application.Iteration += (s, a) =>
|
|
|
+ {
|
|
|
+ while (count > 0)
|
|
|
+ {
|
|
|
+ field.NewKeyDownEvent (new Key (KeyCode.Enter));
|
|
|
+ }
|
|
|
+
|
|
|
+ Application.RequestStop ();
|
|
|
+ };
|
|
|
+
|
|
|
+ var win = new Window ();
|
|
|
+ win.Add (view);
|
|
|
+ win.Add (field);
|
|
|
+
|
|
|
+ top.Add (win);
|
|
|
+
|
|
|
+ Application.Run (top);
|
|
|
+ top.Dispose ();
|
|
|
+
|
|
|
+ Assert.Equal (0, count);
|
|
|
+ }
|
|
|
+
|
|
|
+ // TODO: This actually a SetRelativeLayout/LayoutSubViews test and should be moved
|
|
|
+ // TODO: A new test that calls SetRelativeLayout directly is needed.
|
|
|
+ [Fact]
|
|
|
+ [TestRespondersDisposed]
|
|
|
+ public void SyperView_Referencing_SubView_Throws ()
|
|
|
+ {
|
|
|
+ var super = new View { Width = 10, Height = 10, Text = "super" };
|
|
|
+ var view2 = new View { Width = 10, Height = 10, Text = "view2" };
|
|
|
+
|
|
|
+ var view = new View
|
|
|
+ {
|
|
|
+ Width = Dim.Width (view2), // this is not allowed
|
|
|
+ Height = Dim.Height (view2), // this is not allowed
|
|
|
+ Text = "view"
|
|
|
+ };
|
|
|
+
|
|
|
+ view.Add (view2);
|
|
|
+ super.Add (view);
|
|
|
+ super.BeginInit ();
|
|
|
+ super.EndInit ();
|
|
|
+
|
|
|
+ Assert.Throws<InvalidOperationException> (super.LayoutSubviews);
|
|
|
+ super.Dispose ();
|
|
|
+ }
|
|
|
+
|
|
|
+ // TODO: This actually a SetRelativeLayout/LayoutSubViews test and should be moved
|
|
|
+ // TODO: A new test that calls SetRelativeLayout directly is needed.
|
|
|
+ [Fact]
|
|
|
+ [TestRespondersDisposed]
|
|
|
+ public void Validation_Does_Not_Throw_If_NewValue_Is_DimAbsolute_And_OldValue_Is_Null ()
|
|
|
+ {
|
|
|
+ var t = new View { Width = 80, Height = 25, Text = "top" };
|
|
|
+
|
|
|
+ var w = new Window
|
|
|
+ {
|
|
|
+ X = 1,
|
|
|
+ Y = 2,
|
|
|
+ Width = 4,
|
|
|
+ Height = 5,
|
|
|
+ Title = "w"
|
|
|
+ };
|
|
|
+ t.Add (w);
|
|
|
+ t.LayoutSubviews ();
|
|
|
+
|
|
|
+ Assert.Equal (3, w.Width = 3);
|
|
|
+ Assert.Equal (4, w.Height = 4);
|
|
|
+ t.Dispose ();
|
|
|
+ }
|
|
|
+
|
|
|
[Fact]
|
|
|
[TestRespondersDisposed]
|
|
|
public void Width_Equals ()
|
|
|
@@ -1039,4 +1317,21 @@ public class DimTests
|
|
|
Dim dim = Dim.Width (null);
|
|
|
Assert.Throws<NullReferenceException> (() => dim.ToString ());
|
|
|
}
|
|
|
+
|
|
|
+ [Fact]
|
|
|
+ [TestRespondersDisposed]
|
|
|
+ public void Width_SetsValue ()
|
|
|
+ {
|
|
|
+ var testVal = Rectangle.Empty;
|
|
|
+ var testValView = new View { Frame = testVal };
|
|
|
+ Dim dim = Dim.Width (testValView);
|
|
|
+ Assert.Equal ($"View(Width,View(){testVal})", dim.ToString ());
|
|
|
+ testValView.Dispose ();
|
|
|
+
|
|
|
+ testVal = new Rectangle (1, 2, 3, 4);
|
|
|
+ testValView = new View { Frame = testVal };
|
|
|
+ dim = Dim.Width (testValView);
|
|
|
+ Assert.Equal ($"View(Width,View(){testVal})", dim.ToString ());
|
|
|
+ testValView.Dispose ();
|
|
|
+ }
|
|
|
}
|
Tig