|
|
@@ -669,7 +669,7 @@ public class DimTests
|
|
|
#if DEBUG
|
|
|
Assert.Equal ($"Combine(View(Width,Button(v1){v1.Frame})-View(Width,Button(v3){v3.Bounds}))", v5.Width.ToString ());
|
|
|
#else
|
|
|
- Assert.Equal ("Combine(View(Height,Button()(2,7,47,89))-View(Height,Button()(0,0,9,9)))", v5.Height.ToString ( ));
|
|
|
+ Assert.Equal ($"Combine(View(Height,Button(){v1.Frame})-View(Height,Button(){v3.Bounds}))", v5.Height.ToString ( ));
|
|
|
#endif
|
|
|
Assert.Equal (38, v5.Frame.Width); // 47-9=38
|
|
|
Assert.Equal (80, v5.Frame.Height); // 89-9=80
|
|
|
@@ -705,7 +705,7 @@ public class DimTests
|
|
|
#if DEBUG
|
|
|
Assert.Equal ($"Combine(View(Width,FrameView(f1){f1.Frame})-Absolute(2))", v1.Width.ToString ());
|
|
|
#else
|
|
|
- Assert.Equal ("Combine(View(Width,FrameView()(0,0,99,5))-Absolute(2))", v1.Width.ToString ());
|
|
|
+ Assert.Equal ($"Combine(View(Width,FrameView(){f1.Frame})-Absolute(2))", v1.Width.ToString ());
|
|
|
#endif
|
|
|
Assert.Equal ("Combine(Fill(0)-Absolute(2))", v1.Height.ToString ());
|
|
|
Assert.Equal (97, v1.Frame.Width); // 99-2=97
|
|
|
@@ -716,7 +716,7 @@ public class DimTests
|
|
|
#if DEBUG
|
|
|
Assert.Equal ( $"Combine(View(Width,FrameView(f2){f2.Frame})-Absolute(2))", v2.Width.ToString ());
|
|
|
#else
|
|
|
- Assert.Equal ( "Combine(View(Width,FrameView()(99,0,99,5))-Absolute(2))", v2.Width.ToString ());
|
|
|
+ Assert.Equal ($"Combine(View(Width,FrameView(){f2.Frame})-Absolute(2))", v2.Width.ToString ());
|
|
|
#endif
|
|
|
Assert.Equal ("Combine(Fill(0)-Absolute(2))", v2.Height.ToString ());
|
|
|
Assert.Equal (97, v2.Frame.Width); // 99-2=97
|
|
|
@@ -749,8 +749,8 @@ public class DimTests
|
|
|
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
|
|
|
- Assert.Equal ("Combine(View(Width,Button()(2,7,97,189))-View(Width,Button()(0,0,19,19)))", v5.Width.ToString ());
|
|
|
- Assert.Equal ("Combine(View(Height,Button()(2,7,97,189))-View(Height,Button()(0,0,19,19)))", v5.Height.ToString ());
|
|
|
+ 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
|
|
|
|
|
|
Assert.Equal (78, v5.Frame.Width); // 97-9=78
|
Brandon Thetford