From ea551821503e2ee922c8719184ba6ac3a5684d44 Mon Sep 17 00:00:00 2001 From: Tig Date: Wed, 25 Sep 2024 11:06:52 -0600 Subject: [PATCH] Removed debug code --- Terminal.Gui/Application/Application.Mouse.cs | 6 ------ UnitTests/Application/Mouse/ApplicationMouseTests.cs | 8 ++++++-- UnitTests/View/Mouse/MouseTests.cs | 3 ++- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Terminal.Gui/Application/Application.Mouse.cs b/Terminal.Gui/Application/Application.Mouse.cs index 26e2235d6..38db8727c 100644 --- a/Terminal.Gui/Application/Application.Mouse.cs +++ b/Terminal.Gui/Application/Application.Mouse.cs @@ -217,12 +217,6 @@ public static partial class Application // Mouse handling WantContinuousButtonPressedView = deepestViewUnderMouse.WantContinuousButtonPressed ? deepestViewUnderMouse : null; - //Debug.WriteLine ($"OnMouseEvent: ({a.MouseEvent.X},{a.MouseEvent.Y}) - {a.MouseEvent.Flags}"); - if (deepestViewUnderMouse.Id == "mouseDemo") - { - - } - while (deepestViewUnderMouse.NewMouseEvent (me) is not true && MouseGrabView is not { }) { if (deepestViewUnderMouse is Adornment adornmentView) diff --git a/UnitTests/Application/Mouse/ApplicationMouseTests.cs b/UnitTests/Application/Mouse/ApplicationMouseTests.cs index 2097dbc18..df508b452 100644 --- a/UnitTests/Application/Mouse/ApplicationMouseTests.cs +++ b/UnitTests/Application/Mouse/ApplicationMouseTests.cs @@ -200,14 +200,17 @@ public class ApplicationMouseTests var clicked = false; - Application.Top = new Toplevel (); + Application.Top = new Toplevel () + { + Id = "top", + }; 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 }; + var view = new View { Id = "view", X = pos.X, Y = pos.Y, Width = size.Width, Height = size.Height }; // Give the view a border. With PR #2920, mouse clicks are only passed if they are inside the view's Viewport. view.BorderStyle = LineStyle.Single; @@ -228,6 +231,7 @@ public class ApplicationMouseTests Assert.Equal (expectedClicked, clicked); Application.Top.Dispose (); Application.ResetState (ignoreDisposed: true); + } #endregion mouse coordinate tests diff --git a/UnitTests/View/Mouse/MouseTests.cs b/UnitTests/View/Mouse/MouseTests.cs index e481245fd..28613dadf 100644 --- a/UnitTests/View/Mouse/MouseTests.cs +++ b/UnitTests/View/Mouse/MouseTests.cs @@ -94,7 +94,7 @@ public class MouseTests (ITestOutputHelper output) : TestsAllViews view.NewMouseEvent (new MouseEvent () { Flags = mouseFlags }); Assert.Equal (mouseFlagsFromEvent, expectedMouseFlagsFromEvent); } - + [Fact] public void NewMouseEvent_Invokes_MouseEvent_Properly () { @@ -302,6 +302,7 @@ public class MouseTests (ITestOutputHelper output) : TestsAllViews Assert.Equal (2, clickedCount); view.Dispose (); + Application.ResetState (ignoreDisposed: true); } [Fact]