Rebased onto v2_2491-Overlapped

UnitTests/Application/ApplicationTests.cs

@@ -10,6 +10,7 @@ public class ApplicationTests
     {
         _output = output;
         ConsoleDriver.RunningUnitTests = true;
+        ConfigurationManager.Locations = ConfigurationManager.ConfigLocations.None;
 
 #if DEBUG_IDISPOSABLE
         Responder.Instances.Clear ();
@@ -312,7 +313,7 @@ public class ApplicationTests
             Assert.False (Application._forceFakeConsole);
             Assert.Equal (-1, Application.MainThreadId);
             Assert.Empty (Application.TopLevels);
-            Assert.Null (Application.MouseEnteredView);
+            Assert.Empty (Application._cachedViewsUnderMouse);
 
             // Keyboard
             Assert.Empty (Application.GetViewKeyBindings ());
@@ -342,7 +343,7 @@ public class ApplicationTests
         Application.MainThreadId = 1;
 
         //Application._topLevels = new List<Toplevel> ();
-        Application.MouseEnteredView = new ();
+        Application._cachedViewsUnderMouse.Clear ();
 
         //Application.SupportedCultures = new List<CultureInfo> ();
         Application.Force16Colors = true;
@@ -356,7 +357,7 @@ public class ApplicationTests
 
         //ApplicationOverlapped.OverlappedChildren = new List<View> ();
         //ApplicationOverlapped.OverlappedTop = 
-        Application.MouseEnteredView = new ();
+        Application._cachedViewsUnderMouse.Clear ();
 
         //Application.WantContinuousButtonPressedView = new View ();
 
@@ -392,6 +393,12 @@ public class ApplicationTests
 #endif
     }
 
+    [Fact]
+    public void Shutdown_Alone_Does_Nothing ()
+    {
+        Application.Shutdown ();
+    }
+
     [Theory]
     [InlineData (typeof (FakeDriver))]
     [InlineData (typeof (NetDriver))]

UnitTests/Application/Mouse/ApplicationMouseEnterLeaveTests.cs

@@ -0,0 +1,481 @@
+using System.ComponentModel;
+
+namespace Terminal.Gui.ViewMouseTests;
+
+[Trait ("Category", "Input")]
+public class ApplicationMouseEnterLeaveTests
+{
+    private class TestView : View
+    {
+        public TestView ()
+        {
+            X = 1;
+            Y = 1;
+            Width = 1;
+            Height = 1;
+        }
+
+        public bool CancelOnEnter { get; }
+        public int OnMouseEnterCalled { get; private set; }
+        public int OnMouseLeaveCalled { get; private set; }
+
+        protected override bool OnMouseEnter (CancelEventArgs eventArgs)
+        {
+            OnMouseEnterCalled++;
+            eventArgs.Cancel = CancelOnEnter;
+
+            base.OnMouseEnter (eventArgs);
+
+            return eventArgs.Cancel;
+        }
+
+        protected override void OnMouseLeave ()
+        {
+            OnMouseLeaveCalled++;
+
+            base.OnMouseLeave ();
+        }
+    }
+
+    [Fact]
+    public void RaiseMouseEnterLeaveEvents_MouseEntersView_CallsOnMouseEnter ()
+    {
+        // Arrange
+        Application.Top = new () { Frame = new (0, 0, 10, 10) };
+        var view = new TestView ();
+        Application.Top.Add (view);
+        var mousePosition = new Point (1, 1);
+        List<View> currentViewsUnderMouse = new () { view };
+
+        var mouseEvent = new MouseEvent
+        {
+            Position = mousePosition,
+            ScreenPosition = mousePosition
+        };
+
+        Application._cachedViewsUnderMouse.Clear ();
+
+        try
+        {
+            // Act
+            Application.RaiseMouseEnterLeaveEvents (mousePosition, currentViewsUnderMouse);
+
+            // Assert
+            Assert.Equal (1, view.OnMouseEnterCalled);
+        }
+        finally
+        {
+            // Cleanup
+            Application.Top?.Dispose ();
+            Application.ResetState ();
+        }
+    }
+
+    [Fact]
+    public void RaiseMouseEnterLeaveEvents_MouseLeavesView_CallsOnMouseLeave ()
+    {
+        // Arrange
+        Application.Top = new () { Frame = new (0, 0, 10, 10) };
+        var view = new TestView ();
+        Application.Top.Add (view);
+        var mousePosition = new Point (0, 0);
+        List<View> currentViewsUnderMouse = new ();
+        var mouseEvent = new MouseEvent ();
+
+        Application._cachedViewsUnderMouse.Clear ();
+        Application._cachedViewsUnderMouse.Add (view);
+
+        try
+        {
+            // Act
+            Application.RaiseMouseEnterLeaveEvents (mousePosition, currentViewsUnderMouse);
+
+            // Assert
+            Assert.Equal (0, view.OnMouseEnterCalled);
+            Assert.Equal (1, view.OnMouseLeaveCalled);
+        }
+        finally
+        {
+            // Cleanup
+            Application.Top?.Dispose ();
+            Application.ResetState ();
+        }
+    }
+
+    [Fact]
+    public void RaiseMouseEnterLeaveEvents_MouseMovesBetweenAdjacentViews_CallsOnMouseEnterAndLeave ()
+    {
+        // Arrange
+        Application.Top = new () { Frame = new (0, 0, 10, 10) };
+        var view1 = new TestView (); // at 1,1 to 2,2
+
+        var view2 = new TestView () // at 2,2 to 3,3
+        {
+            X = 2,
+            Y = 2
+        };
+        Application.Top.Add (view1);
+        Application.Top.Add (view2);
+
+        Application._cachedViewsUnderMouse.Clear ();
+
+        try
+        {
+            // Act
+            var mousePosition = new Point (0, 0);
+
+            Application.RaiseMouseEnterLeaveEvents (
+                                                    mousePosition,
+                                                    View.GetViewsUnderMouse (mousePosition));
+
+            // Assert
+            Assert.Equal (0, view1.OnMouseEnterCalled);
+            Assert.Equal (0, view1.OnMouseLeaveCalled);
+            Assert.Equal (0, view2.OnMouseEnterCalled);
+            Assert.Equal (0, view2.OnMouseLeaveCalled);
+
+            // Act
+            mousePosition = new (1, 1);
+
+            Application.RaiseMouseEnterLeaveEvents (
+                                                    mousePosition,
+                                                    View.GetViewsUnderMouse (mousePosition));
+
+            // Assert
+            Assert.Equal (1, view1.OnMouseEnterCalled);
+            Assert.Equal (0, view1.OnMouseLeaveCalled);
+            Assert.Equal (0, view2.OnMouseEnterCalled);
+            Assert.Equal (0, view2.OnMouseLeaveCalled);
+
+            // Act
+            mousePosition = new (2, 2);
+
+            Application.RaiseMouseEnterLeaveEvents (
+                                                    mousePosition,
+                                                    View.GetViewsUnderMouse (mousePosition));
+
+            // Assert
+            Assert.Equal (1, view1.OnMouseEnterCalled);
+            Assert.Equal (1, view1.OnMouseLeaveCalled);
+            Assert.Equal (1, view2.OnMouseEnterCalled);
+            Assert.Equal (0, view2.OnMouseLeaveCalled);
+
+            // Act
+            mousePosition = new (3, 3);
+
+            Application.RaiseMouseEnterLeaveEvents (
+                                                    mousePosition,
+                                                    View.GetViewsUnderMouse (mousePosition));
+
+            // Assert
+            Assert.Equal (1, view1.OnMouseEnterCalled);
+            Assert.Equal (1, view1.OnMouseLeaveCalled);
+            Assert.Equal (1, view2.OnMouseEnterCalled);
+            Assert.Equal (1, view2.OnMouseLeaveCalled);
+
+            // Act
+            mousePosition = new (0, 0);
+
+            Application.RaiseMouseEnterLeaveEvents (
+                                                    mousePosition,
+                                                    View.GetViewsUnderMouse (mousePosition));
+
+            // Assert
+            Assert.Equal (1, view1.OnMouseEnterCalled);
+            Assert.Equal (1, view1.OnMouseLeaveCalled);
+            Assert.Equal (1, view2.OnMouseEnterCalled);
+            Assert.Equal (1, view2.OnMouseLeaveCalled);
+        }
+        finally
+        {
+            // Cleanup
+            Application.Top?.Dispose ();
+            Application.ResetState ();
+        }
+    }
+
+    [Fact]
+    public void RaiseMouseEnterLeaveEvents_NoViewsUnderMouse_DoesNotCallOnMouseEnterOrLeave ()
+    {
+        // Arrange
+        Application.Top = new () { Frame = new (0, 0, 10, 10) };
+        var view = new TestView ();
+        Application.Top.Add (view);
+        var mousePosition = new Point (0, 0);
+        List<View> currentViewsUnderMouse = new ();
+        var mouseEvent = new MouseEvent ();
+
+        Application._cachedViewsUnderMouse.Clear ();
+
+        try
+        {
+            // Act
+            Application.RaiseMouseEnterLeaveEvents (mousePosition, currentViewsUnderMouse);
+
+            // Assert
+            Assert.Equal (0, view.OnMouseEnterCalled);
+            Assert.Equal (0, view.OnMouseLeaveCalled);
+        }
+        finally
+        {
+            // Cleanup
+            Application.Top?.Dispose ();
+            Application.ResetState ();
+        }
+    }
+
+    [Fact]
+    public void RaiseMouseEnterLeaveEvents_MouseMovesBetweenOverlappingPeerViews_CallsOnMouseEnterAndLeave ()
+    {
+        // Arrange
+        Application.Top = new () { Frame = new (0, 0, 10, 10) };
+
+        var view1 = new TestView
+        {
+            Width = 2
+        }; // at 1,1 to 3,2
+
+        var view2 = new TestView () // at 2,2 to 4,3
+        {
+            Width = 2,
+            X = 2,
+            Y = 2
+        };
+        Application.Top.Add (view1);
+        Application.Top.Add (view2);
+
+        Application._cachedViewsUnderMouse.Clear ();
+
+        try
+        {
+            // Act
+            var mousePosition = new Point (0, 0);
+
+            Application.RaiseMouseEnterLeaveEvents (
+                                                    mousePosition,
+                                                    View.GetViewsUnderMouse (mousePosition));
+
+            // Assert
+            Assert.Equal (0, view1.OnMouseEnterCalled);
+            Assert.Equal (0, view1.OnMouseLeaveCalled);
+            Assert.Equal (0, view2.OnMouseEnterCalled);
+            Assert.Equal (0, view2.OnMouseLeaveCalled);
+
+            // Act
+            mousePosition = new (1, 1);
+
+            Application.RaiseMouseEnterLeaveEvents (
+                                                    mousePosition,
+                                                    View.GetViewsUnderMouse (mousePosition));
+
+            // Assert
+            Assert.Equal (1, view1.OnMouseEnterCalled);
+            Assert.Equal (0, view1.OnMouseLeaveCalled);
+            Assert.Equal (0, view2.OnMouseEnterCalled);
+            Assert.Equal (0, view2.OnMouseLeaveCalled);
+
+            // Act
+            mousePosition = new (2, 2);
+
+            Application.RaiseMouseEnterLeaveEvents (
+                                                    mousePosition,
+                                                    View.GetViewsUnderMouse (mousePosition));
+
+            // Assert
+            Assert.Equal (1, view1.OnMouseEnterCalled);
+            Assert.Equal (1, view1.OnMouseLeaveCalled);
+            Assert.Equal (1, view2.OnMouseEnterCalled);
+            Assert.Equal (0, view2.OnMouseLeaveCalled);
+
+            // Act
+            mousePosition = new (3, 3);
+
+            Application.RaiseMouseEnterLeaveEvents (
+                                                    mousePosition,
+                                                    View.GetViewsUnderMouse (mousePosition));
+
+            // Assert
+            Assert.Equal (1, view1.OnMouseEnterCalled);
+            Assert.Equal (1, view1.OnMouseLeaveCalled);
+            Assert.Equal (1, view2.OnMouseEnterCalled);
+            Assert.Equal (1, view2.OnMouseLeaveCalled);
+
+            // Act
+            mousePosition = new (0, 0);
+
+            Application.RaiseMouseEnterLeaveEvents (
+                                                    mousePosition,
+                                                    View.GetViewsUnderMouse (mousePosition));
+
+            // Assert
+            Assert.Equal (1, view1.OnMouseEnterCalled);
+            Assert.Equal (1, view1.OnMouseLeaveCalled);
+            Assert.Equal (1, view2.OnMouseEnterCalled);
+            Assert.Equal (1, view2.OnMouseLeaveCalled);
+
+            // Act
+            mousePosition = new (2, 2);
+
+            Application.RaiseMouseEnterLeaveEvents (
+                                                    mousePosition,
+                                                    View.GetViewsUnderMouse (mousePosition));
+
+            // Assert
+            Assert.Equal (1, view1.OnMouseEnterCalled);
+            Assert.Equal (1, view1.OnMouseLeaveCalled);
+            Assert.Equal (2, view2.OnMouseEnterCalled);
+            Assert.Equal (1, view2.OnMouseLeaveCalled);
+        }
+        finally
+        {
+            // Cleanup
+            Application.Top?.Dispose ();
+            Application.ResetState ();
+        }
+    }
+
+    [Fact]
+    public void RaiseMouseEnterLeaveEvents_MouseMovesBetweenOverlappingSubViews_CallsOnMouseEnterAndLeave ()
+    {
+        // Arrange
+        Application.Top = new () { Frame = new (0, 0, 10, 10) };
+
+        var view1 = new TestView
+        {
+            Id = "view1",
+            Width = 2,
+            Height = 2,
+            Arrangement = ViewArrangement.Overlapped
+        }; // at 1,1 to 3,3 (screen)
+
+        var subView = new TestView
+        {
+            Id = "subView",
+            Width = 2,
+            Height = 2,
+            X = 1,
+            Y = 1,
+            Arrangement = ViewArrangement.Overlapped
+        }; // at 2,2 to 4,4 (screen)
+        view1.Add (subView);
+        Application.Top.Add (view1);
+
+        Application._cachedViewsUnderMouse.Clear ();
+
+        try
+        {
+            Assert.Equal (1, view1.FrameToScreen ().X);
+            Assert.Equal (2, subView.FrameToScreen ().X);
+
+            // Act
+            var mousePosition = new Point (0, 0);
+
+            Application.RaiseMouseEnterLeaveEvents (
+                                                    mousePosition,
+                                                    View.GetViewsUnderMouse (mousePosition));
+
+            // Assert
+            Assert.Equal (0, view1.OnMouseEnterCalled);
+            Assert.Equal (0, view1.OnMouseLeaveCalled);
+            Assert.Equal (0, subView.OnMouseEnterCalled);
+            Assert.Equal (0, subView.OnMouseLeaveCalled);
+
+            // Act
+            mousePosition = new (1, 1);
+
+            Application.RaiseMouseEnterLeaveEvents (
+                                                    mousePosition,
+                                                    View.GetViewsUnderMouse (mousePosition));
+
+            // Assert
+            Assert.Equal (1, view1.OnMouseEnterCalled);
+            Assert.Equal (0, view1.OnMouseLeaveCalled);
+            Assert.Equal (0, subView.OnMouseEnterCalled);
+            Assert.Equal (0, subView.OnMouseLeaveCalled);
+
+            // Act
+            mousePosition = new (2, 2);
+
+            Application.RaiseMouseEnterLeaveEvents (
+                                                    mousePosition,
+                                                    View.GetViewsUnderMouse (mousePosition));
+
+            // Assert
+            Assert.Equal (1, view1.OnMouseEnterCalled);
+            Assert.Equal (0, view1.OnMouseLeaveCalled);
+            Assert.Equal (1, subView.OnMouseEnterCalled);
+            Assert.Equal (0, subView.OnMouseLeaveCalled);
+
+            // Act
+            mousePosition = new (0, 0);
+
+            Application.RaiseMouseEnterLeaveEvents (
+                                                    mousePosition,
+                                                    View.GetViewsUnderMouse (mousePosition));
+
+            // Assert
+            Assert.Equal (1, view1.OnMouseEnterCalled);
+            Assert.Equal (1, view1.OnMouseLeaveCalled);
+            Assert.Equal (1, subView.OnMouseEnterCalled);
+            Assert.Equal (1, subView.OnMouseLeaveCalled);
+
+            // Act
+            mousePosition = new (2, 2);
+
+            Application.RaiseMouseEnterLeaveEvents (
+                                                    mousePosition,
+                                                    View.GetViewsUnderMouse (mousePosition));
+
+            // Assert
+            Assert.Equal (2, view1.OnMouseEnterCalled);
+            Assert.Equal (1, view1.OnMouseLeaveCalled);
+            Assert.Equal (2, subView.OnMouseEnterCalled);
+            Assert.Equal (1, subView.OnMouseLeaveCalled);
+
+            // Act
+            mousePosition = new (3, 3);
+
+            Application.RaiseMouseEnterLeaveEvents (
+                                                    mousePosition,
+                                                    View.GetViewsUnderMouse (mousePosition));
+
+            // Assert
+            Assert.Equal (2, view1.OnMouseEnterCalled);
+            Assert.Equal (2, view1.OnMouseLeaveCalled);
+            Assert.Equal (2, subView.OnMouseEnterCalled);
+            Assert.Equal (2, subView.OnMouseLeaveCalled);
+
+            // Act
+            mousePosition = new (0, 0);
+
+            Application.RaiseMouseEnterLeaveEvents (
+                                                    mousePosition,
+                                                    View.GetViewsUnderMouse (mousePosition));
+
+            // Assert
+            Assert.Equal (2, view1.OnMouseEnterCalled);
+            Assert.Equal (2, view1.OnMouseLeaveCalled);
+            Assert.Equal (2, subView.OnMouseEnterCalled);
+            Assert.Equal (2, subView.OnMouseLeaveCalled);
+
+            // Act
+            mousePosition = new (2, 2);
+
+            Application.RaiseMouseEnterLeaveEvents (
+                                                    mousePosition,
+                                                    View.GetViewsUnderMouse (mousePosition));
+
+            // Assert
+            Assert.Equal (3, view1.OnMouseEnterCalled);
+            Assert.Equal (2, view1.OnMouseLeaveCalled);
+            Assert.Equal (3, subView.OnMouseEnterCalled);
+            Assert.Equal (2, subView.OnMouseLeaveCalled);
+        }
+        finally
+        {
+            // Cleanup
+            Application.Top?.Dispose ();
+            Application.ResetState ();
+        }
+    }
+}

UnitTests/Application/Mouse/ApplicationMouseTests.cs

@@ -4,11 +4,12 @@
 
 namespace Terminal.Gui.ApplicationTests;
 
-public class MouseTests
+[Trait ("Category", "Input")]
+public class ApplicationMouseTests
 {
     private readonly ITestOutputHelper _output;
 
-    public MouseTests (ITestOutputHelper output)
+    public ApplicationMouseTests (ITestOutputHelper output)
     {
         _output = output;
 #if DEBUG_IDISPOSABLE
@@ -137,7 +138,7 @@ public class MouseTests
     ///     Tests that the mouse coordinates passed to the focused view are correct when the mouse is clicked. With
     ///     Frames; Frame != Viewport
     /// </summary>
-    [AutoInitShutdown]
+    //[AutoInitShutdown]
     [Theory]
 
     // click on border
@@ -199,12 +200,12 @@ public class MouseTests
 
         var clicked = false;
 
-        var top = new Toplevel ();
-        top.X = 0;
-        top.Y = 0;
-        top.Width = size.Width * 2;
-        top.Height = size.Height * 2;
-        top.BorderStyle = LineStyle.None;
+        Application.Top = new Toplevel ();
+        Application.Top.X = 0;
+        Application.Top.Y = 0;
+        Application.Top.Width = size.Width * 2;
+        Application.Top.Height = size.Height * 2;
+        Application.Top.BorderStyle = LineStyle.None;
 
         var view = new View { X = pos.X, Y = pos.Y, Width = size.Width, Height = size.Height };
 
@@ -212,8 +213,8 @@ public class MouseTests
         view.BorderStyle = LineStyle.Single;
         view.CanFocus = true;
 
-        top.Add (view);
-        Application.Begin (top);
+        Application.Top.Add (view);
+
         var mouseEvent = new MouseEvent { Position = new (clickX, clickY), Flags = MouseFlags.Button1Clicked };
 
         view.MouseClick += (s, e) =>
@@ -225,7 +226,8 @@ public class MouseTests
 
         Application.OnMouseEvent (mouseEvent);
         Assert.Equal (expectedClicked, clicked);
-        top.Dispose ();
+        Application.Top.Dispose ();
+        Application.ResetState (ignoreDisposed: true);
     }
 
     #endregion mouse coordinate tests
@@ -401,5 +403,6 @@ public class MouseTests
         Assert.Equal (0, count);
         top.Dispose ();
     }
+
     #endregion
 }