This commit is contained in:
Tig
2024-05-08 17:02:34 -06:00
parent 14beaefe5c
commit a563e03ec2
10 changed files with 70 additions and 72 deletions

View File

@@ -867,7 +867,7 @@ public class NavigationTests
screen = top.ViewportToScreen (new (-1, -1, 0, 0));
Assert.Equal (0, screen.X);
Assert.Equal (0, screen.Y);
var found = View.FindDeepestView (top, 0, 0);
var found = View.FindDeepestView (top, new (0, 0));
Assert.Equal (top.Border, found);
Assert.Equal (0, found.Frame.X);
@@ -876,11 +876,11 @@ public class NavigationTests
screen = top.ViewportToScreen (new (3, 2, 0, 0));
Assert.Equal (4, screen.X);
Assert.Equal (3, screen.Y);
found = View.FindDeepestView (top, screen.X, screen.Y);
found = View.FindDeepestView (top, new (screen.X, screen.Y));
Assert.Equal (view, found);
//Assert.Equal (0, found.FrameToScreen ().X);
//Assert.Equal (0, found.FrameToScreen ().Y);
found = View.FindDeepestView (top, 3, 2);
found = View.FindDeepestView (top, new (3, 2));
Assert.Equal (top, found);
//Assert.Equal (3, found.FrameToScreen ().X);
//Assert.Equal (2, found.FrameToScreen ().Y);
@@ -888,14 +888,14 @@ public class NavigationTests
screen = top.ViewportToScreen (new (12, 2, 0, 0));
Assert.Equal (13, screen.X);
Assert.Equal (3, screen.Y);
found = View.FindDeepestView (top, screen.X, screen.Y);
found = View.FindDeepestView (top, new (screen.X, screen.Y));
Assert.Equal (view, found);
//Assert.Equal (9, found.FrameToScreen ().X);
//Assert.Equal (0, found.FrameToScreen ().Y);
screen = top.ViewportToScreen (new (13, 2, 0, 0));
Assert.Equal (14, screen.X);
Assert.Equal (3, screen.Y);
found = View.FindDeepestView (top, 13, 2);
found = View.FindDeepestView (top, new (13, 2));
Assert.Equal (top, found);
//Assert.Equal (13, found.FrameToScreen ().X);
//Assert.Equal (2, found.FrameToScreen ().Y);
@@ -903,7 +903,7 @@ public class NavigationTests
screen = top.ViewportToScreen (new (14, 3, 0, 0));
Assert.Equal (15, screen.X);
Assert.Equal (4, screen.Y);
found = View.FindDeepestView (top, 14, 3);
found = View.FindDeepestView (top, new (14, 3));
Assert.Equal (top, found);
//Assert.Equal (14, found.FrameToScreen ().X);
//Assert.Equal (3, found.FrameToScreen ().Y);
@@ -925,28 +925,28 @@ public class NavigationTests
screen = view.ViewportToScreen (new (-4, -3, 0, 0));
Assert.Equal (0, screen.X);
Assert.Equal (0, screen.Y);
found = View.FindDeepestView (top, 0, 0);
found = View.FindDeepestView (top, new (0, 0));
Assert.Equal (top.Border, found);
Assert.Equal (new Point (-1, -1), view.ScreenToFrame (new (3, 2)));
screen = view.ViewportToScreen (new (0, 0, 0, 0));
Assert.Equal (4, screen.X);
Assert.Equal (3, screen.Y);
found = View.FindDeepestView (top, 4, 3);
found = View.FindDeepestView (top, new (4, 3));
Assert.Equal (view, found);
Assert.Equal (new Point (9, -1), view.ScreenToFrame (new (13, 2)));
screen = view.ViewportToScreen (new (10, 0, 0, 0));
Assert.Equal (14, screen.X);
Assert.Equal (3, screen.Y);
found = View.FindDeepestView (top, 14, 3);
found = View.FindDeepestView (top, new (14, 3));
Assert.Equal (top, found);
Assert.Equal (new Point (10, 0), view.ScreenToFrame (new (14, 3)));
screen = view.ViewportToScreen (new (11, 1, 0, 0));
Assert.Equal (15, screen.X);
Assert.Equal (4, screen.Y);
found = View.FindDeepestView (top, 15, 4);
found = View.FindDeepestView (top, new (15, 4));
Assert.Equal (top, found);
}
@@ -1021,27 +1021,27 @@ public class NavigationTests
screen = top.ViewportToScreen (new (-4, -3, 0, 0));
Assert.Equal (0, screen.X);
Assert.Equal (0, screen.Y);
var found = View.FindDeepestView (top, -4, -3);
var found = View.FindDeepestView (top, new (-4, -3));
Assert.Null (found);
Assert.Equal (Point.Empty, top.ScreenToFrame (new (3, 2)));
screen = top.ViewportToScreen (new (0, 0, 0, 0));
Assert.Equal (4, screen.X);
Assert.Equal (3, screen.Y);
Assert.Equal (top.Border, View.FindDeepestView (top, 3, 2));
Assert.Equal (top.Border, View.FindDeepestView (top, new (3, 2)));
//Assert.Equal (0, found.FrameToScreen ().X);
//Assert.Equal (0, found.FrameToScreen ().Y);
Assert.Equal (new Point (10, 0), top.ScreenToFrame (new (13, 2)));
screen = top.ViewportToScreen (new (10, 0, 0, 0));
Assert.Equal (14, screen.X);
Assert.Equal (3, screen.Y);
Assert.Equal (top.Border, View.FindDeepestView (top, 13, 2));
Assert.Equal (top.Border, View.FindDeepestView (top, new (13, 2)));
//Assert.Equal (10, found.FrameToScreen ().X);
//Assert.Equal (0, found.FrameToScreen ().Y);
Assert.Equal (new Point (11, 1), top.ScreenToFrame (new (14, 3)));
screen = top.ViewportToScreen (new (11, 1, 0, 0));
Assert.Equal (15, screen.X);
Assert.Equal (4, screen.Y);
Assert.Equal (top, View.FindDeepestView (top, 14, 3));
Assert.Equal (top, View.FindDeepestView (top, new (14, 3)));
// view
Assert.Equal (new Point (-7, -5), view.ScreenToFrame (new (0, 0)));
@@ -1057,32 +1057,32 @@ public class NavigationTests
screen = view.ViewportToScreen (new (-6, -4, 0, 0));
Assert.Equal (1, screen.X);
Assert.Equal (1, screen.Y);
Assert.Null (View.FindDeepestView (top, 1, 1));
Assert.Null (View.FindDeepestView (top, new (1, 1)));
Assert.Equal (new Point (-4, -3), view.ScreenToFrame (new (3, 2)));
screen = view.ViewportToScreen (new (-3, -2, 0, 0));
Assert.Equal (4, screen.X);
Assert.Equal (3, screen.Y);
Assert.Equal (top, View.FindDeepestView (top, 4, 3));
Assert.Equal (top, View.FindDeepestView (top, new (4, 3)));
Assert.Equal (new Point (-1, -1), view.ScreenToFrame (new (6, 4)));
screen = view.ViewportToScreen (new (0, 0, 0, 0));
Assert.Equal (7, screen.X);
Assert.Equal (5, screen.Y);
Assert.Equal (view, View.FindDeepestView (top, 7, 5));
Assert.Equal (view, View.FindDeepestView (top, new (7, 5)));
Assert.Equal (new Point (6, -1), view.ScreenToFrame (new (13, 4)));
screen = view.ViewportToScreen (new (7, 0, 0, 0));
Assert.Equal (14, screen.X);
Assert.Equal (5, screen.Y);
Assert.Equal (view, View.FindDeepestView (top, 14, 5));
Assert.Equal (view, View.FindDeepestView (top, new (14, 5)));
Assert.Equal (new Point (7, -2), view.ScreenToFrame (new (14, 3)));
screen = view.ViewportToScreen (new (8, -1, 0, 0));
Assert.Equal (15, screen.X);
Assert.Equal (4, screen.Y);
Assert.Equal (top, View.FindDeepestView (top, 15, 4));
Assert.Equal (top, View.FindDeepestView (top, new (15, 4)));
Assert.Equal (new Point (16, -2), view.ScreenToFrame (new (23, 3)));
screen = view.ViewportToScreen (new (17, -1, 0, 0));
Assert.Equal (24, screen.X);
Assert.Equal (4, screen.Y);
Assert.Null (View.FindDeepestView (top, 24, 4));
Assert.Null (View.FindDeepestView (top, new (24, 4)));
}
[Fact]