From a9e1f2a2cba9ac35d3670acce9cf1e3f363d3cad Mon Sep 17 00:00:00 2001 From: Tig Date: Mon, 14 Oct 2024 18:30:21 -0600 Subject: [PATCH] View.Mouse cleanup - WIP --- .../Application/Application.Initialization.cs | 2 +- Terminal.Gui/Application/Application.Mouse.cs | 2 +- Terminal.Gui/Input/Mouse.cs | 2 +- Terminal.Gui/View/View.Mouse.cs | 46 +++++++++---------- UnitTests/Application/ApplicationTests.cs | 6 +-- .../Mouse/ApplicationMouseTests.cs | 16 +++---- UnitTests/Input/EscSeqUtilsTests.cs | 4 +- UnitTests/View/Mouse/MouseTests.cs | 4 +- UnitTests/Views/ColorPickerTests.cs | 4 +- UnitTests/Views/ContextMenuTests.cs | 22 ++++----- UnitTests/Views/LabelTests.cs | 6 +-- UnitTests/Views/ListViewTests.cs | 10 ++-- UnitTests/Views/MenuBarTests.cs | 10 ++-- UnitTests/Views/ScrollBarViewTests.cs | 4 +- UnitTests/Views/ShortcutTests.cs | 8 ++-- UnitTests/Views/TabViewTests.cs | 18 ++++---- UnitTests/Views/TextFieldTests.cs | 6 +-- UnitTests/Views/ToplevelTests.cs | 44 +++++++++--------- 18 files changed, 107 insertions(+), 107 deletions(-) diff --git a/Terminal.Gui/Application/Application.Initialization.cs b/Terminal.Gui/Application/Application.Initialization.cs index c8310b780..c1058f838 100644 --- a/Terminal.Gui/Application/Application.Initialization.cs +++ b/Terminal.Gui/Application/Application.Initialization.cs @@ -180,7 +180,7 @@ public static partial class Application // Initialization (Init/Shutdown) private static void Driver_SizeChanged (object? sender, SizeChangedEventArgs e) { OnSizeChanging (e); } private static void Driver_KeyDown (object? sender, Key e) { RaiseKeyDownEvent (e); } private static void Driver_KeyUp (object? sender, Key e) { RaiseKeyUpEvent (e); } - private static void Driver_MouseEvent (object? sender, MouseEvent e) { OnMouseEvent (e); } + private static void Driver_MouseEvent (object? sender, MouseEvent e) { RaiseMouseEvent (e); } /// Gets of list of types that are available. /// diff --git a/Terminal.Gui/Application/Application.Mouse.cs b/Terminal.Gui/Application/Application.Mouse.cs index 051e9f4fd..9ac7df27a 100644 --- a/Terminal.Gui/Application/Application.Mouse.cs +++ b/Terminal.Gui/Application/Application.Mouse.cs @@ -201,7 +201,7 @@ public static partial class Application // Mouse handling View = deepestViewUnderMouse }; } - else if (deepestViewUnderMouse.ViewportToScreen (Rectangle.Empty with { Size = deepestViewUnderMouse.Viewport.Size }).Contains (mouseEvent.Position)) + else if (deepestViewUnderMouse.ViewportToScreen (Rectangle.Empty with { Size = deepestViewUnderMouse.Viewport.Size }).Contains (mouseEvent.ScreenPosition)) { Point viewportLocation = deepestViewUnderMouse.ScreenToViewport (mouseEvent.ScreenPosition); diff --git a/Terminal.Gui/Input/Mouse.cs b/Terminal.Gui/Input/Mouse.cs index 3c8c98e91..8069a339d 100644 --- a/Terminal.Gui/Input/Mouse.cs +++ b/Terminal.Gui/Input/Mouse.cs @@ -129,7 +129,7 @@ public class MouseEvent /// mouse has moved. /// /// - /// Calculated and processed in . + /// Calculated and processed in . /// /// public Point ScreenPosition { get; set; } diff --git a/Terminal.Gui/View/View.Mouse.cs b/Terminal.Gui/View/View.Mouse.cs index 2fc180ece..48a3ea126 100644 --- a/Terminal.Gui/View/View.Mouse.cs +++ b/Terminal.Gui/View/View.Mouse.cs @@ -11,7 +11,7 @@ public partial class View // Mouse APIs private ColorScheme? _savedNonHoverColorScheme; /// - /// INTERNAL Called by when the mouse moves over the View's . + /// INTERNAL Called by when the mouse moves over the View's . /// will /// be raised when the mouse is no longer over the . If another View occludes this View, the /// that View will also receive MouseEnter/Leave events. @@ -126,7 +126,7 @@ public partial class View // Mouse APIs public event EventHandler? MouseEnter; /// - /// INTERNAL Called by when the mouse leaves , or is occluded + /// INTERNAL Called by when the mouse leaves , or is occluded /// by another non-SubView. /// /// @@ -196,16 +196,15 @@ public partial class View // Mouse APIs #region Low Level Mouse Events - /// Event fired when a mouse event occurs. - /// - /// - /// The coordinates are relative to . - /// - /// - public event EventHandler? MouseEvent; + /// Gets or sets whether the wants continuous button pressed events. + public virtual bool WantContinuousButtonPressed { get; set; } + + /// Gets or sets whether the wants mouse position reports. + /// if mouse position reports are wanted; otherwise, . + public virtual bool WantMousePositionReports { get; set; } /// - /// Processes a . This method is called by when a mouse + /// Processes a new . This method is called by when a mouse /// event occurs. /// /// @@ -213,15 +212,15 @@ public partial class View // Mouse APIs /// A view must be both enabled and visible to receive mouse events. /// /// - /// This method calls to process the event. If the event is not handled, and one of the - /// mouse buttons was clicked, it calls to process the click. + /// This method raises /; if not handled, and one of the + /// mouse buttons was clicked, the / event will be raised /// /// /// See for more information. /// /// - /// If is , the event - /// will be invoked repeatedly while the button is pressed. + /// If is , the / event + /// will be raised on any new mouse event where indicates a button is pressed. /// /// /// @@ -297,13 +296,6 @@ public partial class View // Mouse APIs return false; } - /// Gets or sets whether the wants continuous button pressed events. - public virtual bool WantContinuousButtonPressed { get; set; } - - /// Gets or sets whether the wants mouse position reports. - /// if mouse position reports are wanted; otherwise, . - public virtual bool WantMousePositionReports { get; set; } - /// Called when a mouse event occurs within the view's . /// /// @@ -312,7 +304,7 @@ public partial class View // Mouse APIs /// /// /// , if the event was handled, otherwise. - protected internal virtual bool OnMouseEvent (MouseEvent mouseEvent) + protected virtual bool OnMouseEvent (MouseEvent mouseEvent) { var args = new MouseEventEventArgs (mouseEvent); @@ -321,11 +313,19 @@ public partial class View // Mouse APIs return args.Handled; } + /// Raised when a mouse event occurs. + /// + /// + /// The coordinates are relative to . + /// + /// + public event EventHandler? MouseEvent; + #endregion Low Level Mouse Events #region Mouse Click Events - /// Event fired when a mouse click occurs. + /// Raised when a mouse click occurs. /// /// /// diff --git a/UnitTests/Application/ApplicationTests.cs b/UnitTests/Application/ApplicationTests.cs index 81209dddb..215e7e050 100644 --- a/UnitTests/Application/ApplicationTests.cs +++ b/UnitTests/Application/ApplicationTests.cs @@ -856,7 +856,7 @@ public class ApplicationTests } else if (iteration < 3) { - Application.OnMouseEvent (new () { Flags = MouseFlags.ReportMousePosition }); + Application.RaiseMouseEvent (new () { Flags = MouseFlags.ReportMousePosition }); Assert.False (top.NeedsDisplay); Assert.False (top.SubViewNeedsDisplay); Assert.False (top.LayoutNeeded); @@ -895,12 +895,12 @@ public class ApplicationTests // Don't use visuals to test as style of border can change over time. Assert.Equal (new (0, 0), w.Frame.Location); - Application.OnMouseEvent (new () { Flags = MouseFlags.Button1Pressed }); + Application.RaiseMouseEvent (new () { Flags = MouseFlags.Button1Pressed }); Assert.Equal (w.Border, Application.MouseGrabView); Assert.Equal (new (0, 0), w.Frame.Location); // Move down and to the right. - Application.OnMouseEvent (new () { ScreenPosition = new (1, 1), Flags = MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition }); + Application.RaiseMouseEvent (new () { ScreenPosition = new (1, 1), Flags = MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition }); Assert.Equal (new (1, 1), w.Frame.Location); Application.End (rs); diff --git a/UnitTests/Application/Mouse/ApplicationMouseTests.cs b/UnitTests/Application/Mouse/ApplicationMouseTests.cs index c5a86a85c..963807695 100644 --- a/UnitTests/Application/Mouse/ApplicationMouseTests.cs +++ b/UnitTests/Application/Mouse/ApplicationMouseTests.cs @@ -54,7 +54,7 @@ public class ApplicationMouseTests Application.MouseEvent += OnApplicationOnMouseEvent; - Application.OnMouseEvent (mouseEvent); + Application.RaiseMouseEvent (mouseEvent); Assert.Equal (expectedClicked, clicked); Application.MouseEvent -= OnApplicationOnMouseEvent; } @@ -129,7 +129,7 @@ public class ApplicationMouseTests top.Add (view); Application.Begin (top); - Application.OnMouseEvent (mouseEvent); + Application.RaiseMouseEvent (mouseEvent); Assert.Equal (expectedClicked, clicked); top.Dispose (); } @@ -227,7 +227,7 @@ public class ApplicationMouseTests clicked = true; }; - Application.OnMouseEvent (mouseEvent); + Application.RaiseMouseEvent (mouseEvent); Assert.Equal (expectedClicked, clicked); Application.Top.Dispose (); Application.ResetState (ignoreDisposed: true); @@ -261,7 +261,7 @@ public class ApplicationMouseTests Assert.True (tf.HasFocus); Assert.Null (Application.MouseGrabView); - Application.OnMouseEvent (new () { ScreenPosition = new (5, 5), Flags = MouseFlags.ReportMousePosition }); + Application.RaiseMouseEvent (new () { ScreenPosition = new (5, 5), Flags = MouseFlags.ReportMousePosition }); Assert.Equal (sv, Application.MouseGrabView); @@ -275,15 +275,15 @@ public class ApplicationMouseTests // another toplevel (Dialog) was opened Assert.Null (Application.MouseGrabView); - Application.OnMouseEvent (new () { ScreenPosition = new (5, 5), Flags = MouseFlags.ReportMousePosition }); + Application.RaiseMouseEvent (new () { ScreenPosition = new (5, 5), Flags = MouseFlags.ReportMousePosition }); Assert.Null (Application.MouseGrabView); - Application.OnMouseEvent (new () { ScreenPosition = new (40, 12), Flags = MouseFlags.ReportMousePosition }); + Application.RaiseMouseEvent (new () { ScreenPosition = new (40, 12), Flags = MouseFlags.ReportMousePosition }); Assert.Null (Application.MouseGrabView); - Application.OnMouseEvent (new () { ScreenPosition = new (0, 0), Flags = MouseFlags.Button1Pressed }); + Application.RaiseMouseEvent (new () { ScreenPosition = new (0, 0), Flags = MouseFlags.Button1Pressed }); Assert.Null (Application.MouseGrabView); @@ -402,7 +402,7 @@ public class ApplicationMouseTests Assert.True (view.WasDisposed); #endif - Application.OnMouseEvent (new () { ScreenPosition = new (0, 0), Flags = MouseFlags.Button1Pressed }); + Application.RaiseMouseEvent (new () { ScreenPosition = new (0, 0), Flags = MouseFlags.Button1Pressed }); Assert.Null (Application.MouseGrabView); Assert.Equal (0, count); top.Dispose (); diff --git a/UnitTests/Input/EscSeqUtilsTests.cs b/UnitTests/Input/EscSeqUtilsTests.cs index 3ac8e4c60..9b811f002 100644 --- a/UnitTests/Input/EscSeqUtilsTests.cs +++ b/UnitTests/Input/EscSeqUtilsTests.cs @@ -696,7 +696,7 @@ public class EscSeqUtilsTests top.Add (view); Application.Begin (top); - Application.OnMouseEvent (new() { Position = new (0, 0), Flags = 0 }); + Application.RaiseMouseEvent (new() { Position = new (0, 0), Flags = 0 }); ClearAll (); @@ -753,7 +753,7 @@ public class EscSeqUtilsTests // set Application.WantContinuousButtonPressedView to null view.WantContinuousButtonPressed = false; - Application.OnMouseEvent (new() { Position = new (0, 0), Flags = 0 }); + Application.RaiseMouseEvent (new() { Position = new (0, 0), Flags = 0 }); Application.RequestStop (); } diff --git a/UnitTests/View/Mouse/MouseTests.cs b/UnitTests/View/Mouse/MouseTests.cs index 8c021e3c4..87f3e71b5 100644 --- a/UnitTests/View/Mouse/MouseTests.cs +++ b/UnitTests/View/Mouse/MouseTests.cs @@ -106,9 +106,9 @@ public class MouseTests (ITestOutputHelper output) : TestsAllViews Application.Begin (top); Assert.Equal (new Point (4, 4), testView.Frame.Location); - Application.OnMouseEvent (new () { ScreenPosition = new (xy, xy), Flags = MouseFlags.Button1Pressed }); + Application.RaiseMouseEvent (new () { ScreenPosition = new (xy, xy), Flags = MouseFlags.Button1Pressed }); - Application.OnMouseEvent (new () { ScreenPosition = new (xy + 1, xy + 1), Flags = MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition }); + Application.RaiseMouseEvent (new () { ScreenPosition = new (xy + 1, xy + 1), Flags = MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition }); Assert.Equal (expectedMoved, new Point (5, 5) == testView.Frame.Location); top.Dispose (); diff --git a/UnitTests/Views/ColorPickerTests.cs b/UnitTests/Views/ColorPickerTests.cs index 57f4144c9..73fe010be 100644 --- a/UnitTests/Views/ColorPickerTests.cs +++ b/UnitTests/Views/ColorPickerTests.cs @@ -434,7 +434,7 @@ public class ColorPickerTests cp.Draw (); // Click on Green bar - Application.OnMouseEvent (new () + Application.RaiseMouseEvent (new () { Flags = MouseFlags.Button1Pressed, ScreenPosition = new (0, 1) @@ -453,7 +453,7 @@ public class ColorPickerTests Assert.IsAssignableFrom (cp.Focused); // Click on Blue bar - Application.OnMouseEvent (new () + Application.RaiseMouseEvent (new () { Flags = MouseFlags.Button1Pressed, ScreenPosition = new (0, 2) diff --git a/UnitTests/Views/ContextMenuTests.cs b/UnitTests/Views/ContextMenuTests.cs index 3a84d3b56..098ee3aac 100644 --- a/UnitTests/Views/ContextMenuTests.cs +++ b/UnitTests/Views/ContextMenuTests.cs @@ -148,7 +148,7 @@ public class ContextMenuTests (ITestOutputHelper output) output ); - Application.OnMouseEvent (new MouseEvent { ScreenPosition = new (8, 2), Flags = MouseFlags.Button3Clicked }); + Application.RaiseMouseEvent (new MouseEvent { ScreenPosition = new (8, 2), Flags = MouseFlags.Button3Clicked }); var firstIteration = false; Application.RunIteration (ref rs, ref firstIteration); @@ -231,7 +231,7 @@ public class ContextMenuTests (ITestOutputHelper output) output ); - Application.OnMouseEvent (new MouseEvent { ScreenPosition = new (9, 3), Flags = MouseFlags.Button3Clicked }); + Application.RaiseMouseEvent (new MouseEvent { ScreenPosition = new (9, 3), Flags = MouseFlags.Button3Clicked }); var firstIteration = false; Application.RunIteration (ref rsDialog, ref firstIteration); @@ -287,7 +287,7 @@ public class ContextMenuTests (ITestOutputHelper output) output ); - Application.OnMouseEvent (new MouseEvent { ScreenPosition = new (9, 3), Flags = MouseFlags.Button3Clicked }); + Application.RaiseMouseEvent (new MouseEvent { ScreenPosition = new (9, 3), Flags = MouseFlags.Button3Clicked }); var firstIteration = false; Application.RunIteration (ref rs, ref firstIteration); @@ -1235,7 +1235,7 @@ public class ContextMenuTests (ITestOutputHelper output) ); // X=5 is the border and so need to use at least one more - Application.OnMouseEvent (new MouseEvent { ScreenPosition = new (6, 13), Flags = MouseFlags.Button1Clicked }); + Application.RaiseMouseEvent (new MouseEvent { ScreenPosition = new (6, 13), Flags = MouseFlags.Button1Clicked }); var firstIteration = false; Application.RunIteration (ref rs, ref firstIteration); @@ -1253,7 +1253,7 @@ public class ContextMenuTests (ITestOutputHelper output) output ); - Application.OnMouseEvent (new MouseEvent { ScreenPosition = new (6, 12), Flags = MouseFlags.Button1Clicked }); + Application.RaiseMouseEvent (new MouseEvent { ScreenPosition = new (6, 12), Flags = MouseFlags.Button1Clicked }); firstIteration = false; Application.RunIteration (ref rs, ref firstIteration); @@ -1327,7 +1327,7 @@ public class ContextMenuTests (ITestOutputHelper output) output ); - Application.OnMouseEvent (new MouseEvent { ScreenPosition = new (6, 13), Flags = MouseFlags.ReportMousePosition }); + Application.RaiseMouseEvent (new MouseEvent { ScreenPosition = new (6, 13), Flags = MouseFlags.ReportMousePosition }); var firstIteration = false; Application.RunIteration (ref rs, ref firstIteration); @@ -1344,7 +1344,7 @@ public class ContextMenuTests (ITestOutputHelper output) output ); - Application.OnMouseEvent (new MouseEvent { ScreenPosition = new (6, 14), Flags = MouseFlags.ReportMousePosition }); + Application.RaiseMouseEvent (new MouseEvent { ScreenPosition = new (6, 14), Flags = MouseFlags.ReportMousePosition }); firstIteration = false; Application.RunIteration (ref rs, ref firstIteration); @@ -1362,7 +1362,7 @@ public class ContextMenuTests (ITestOutputHelper output) output ); - Application.OnMouseEvent (new MouseEvent { ScreenPosition = new (6, 13), Flags = MouseFlags.ReportMousePosition }); + Application.RaiseMouseEvent (new MouseEvent { ScreenPosition = new (6, 13), Flags = MouseFlags.ReportMousePosition }); firstIteration = false; Application.RunIteration (ref rs, ref firstIteration); @@ -1399,7 +1399,7 @@ public class ContextMenuTests (ITestOutputHelper output) Assert.Empty (Application._cachedViewsUnderMouse); // Right click on tf2 to open context menu - Application.OnMouseEvent (new () { ScreenPosition = new (1, 3), Flags = MouseFlags.Button3Clicked }); + Application.RaiseMouseEvent (new () { ScreenPosition = new (1, 3), Flags = MouseFlags.Button3Clicked }); Assert.False (tf1.HasFocus); Assert.False (tf2.HasFocus); Assert.Equal (5, win.Subviews.Count); @@ -1409,7 +1409,7 @@ public class ContextMenuTests (ITestOutputHelper output) Assert.Equal (tf2, Application._cachedViewsUnderMouse.LastOrDefault ()); // Click on tf1 to focus it, which cause context menu being closed - Application.OnMouseEvent (new () { ScreenPosition = new (1, 1), Flags = MouseFlags.Button1Clicked }); + Application.RaiseMouseEvent (new () { ScreenPosition = new (1, 1), Flags = MouseFlags.Button1Clicked }); Assert.True (tf1.HasFocus); Assert.False (tf2.HasFocus); Assert.Equal (4, win.Subviews.Count); @@ -1421,7 +1421,7 @@ public class ContextMenuTests (ITestOutputHelper output) Assert.Equal (tf1, Application._cachedViewsUnderMouse.LastOrDefault ()); // Click on tf2 to focus it - Application.OnMouseEvent (new () { ScreenPosition = new (1, 3), Flags = MouseFlags.Button1Clicked }); + Application.RaiseMouseEvent (new () { ScreenPosition = new (1, 3), Flags = MouseFlags.Button1Clicked }); Assert.False (tf1.HasFocus); Assert.True (tf2.HasFocus); Assert.Equal (4, win.Subviews.Count); diff --git a/UnitTests/Views/LabelTests.cs b/UnitTests/Views/LabelTests.cs index 2eb73d34f..80f1e2b7c 100644 --- a/UnitTests/Views/LabelTests.cs +++ b/UnitTests/Views/LabelTests.cs @@ -1364,7 +1364,7 @@ e Application.Top.SetFocus (); // click on label - Application.OnMouseEvent (new () { ScreenPosition = label.Frame.Location, Flags = MouseFlags.Button1Clicked }); + Application.RaiseMouseEvent (new () { ScreenPosition = label.Frame.Location, Flags = MouseFlags.Button1Clicked }); Assert.False (label.HasFocus); Assert.True (nextView.HasFocus); @@ -1442,12 +1442,12 @@ e Assert.True (otherView.HasFocus); // label can focus, so clicking on it set focus - Application.OnMouseEvent (new () { ScreenPosition = new (0, 0), Flags = MouseFlags.Button1Clicked }); + Application.RaiseMouseEvent (new () { ScreenPosition = new (0, 0), Flags = MouseFlags.Button1Clicked }); Assert.True (label.HasFocus); Assert.False (otherView.HasFocus); // click on view - Application.OnMouseEvent (new () { ScreenPosition = new (0, 1), Flags = MouseFlags.Button1Clicked }); + Application.RaiseMouseEvent (new () { ScreenPosition = new (0, 1), Flags = MouseFlags.Button1Clicked }); Assert.False (label.HasFocus); Assert.True (otherView.HasFocus); diff --git a/UnitTests/Views/ListViewTests.cs b/UnitTests/Views/ListViewTests.cs index 3da369db1..1f5553c2c 100644 --- a/UnitTests/Views/ListViewTests.cs +++ b/UnitTests/Views/ListViewTests.cs @@ -737,11 +737,11 @@ Item 6", └─────┘", output); - Application.OnMouseEvent (new () { ScreenPosition = new (0, 0), Flags = MouseFlags.Button1Clicked }); + Application.RaiseMouseEvent (new () { ScreenPosition = new (0, 0), Flags = MouseFlags.Button1Clicked }); Assert.Equal ("", selected); Assert.Equal (-1, lv.SelectedItem); - Application.OnMouseEvent ( + Application.RaiseMouseEvent ( new () { ScreenPosition = new (1, 1), Flags = MouseFlags.Button1Clicked @@ -749,7 +749,7 @@ Item 6", Assert.Equal ("One", selected); Assert.Equal (0, lv.SelectedItem); - Application.OnMouseEvent ( + Application.RaiseMouseEvent ( new () { ScreenPosition = new (1, 2), Flags = MouseFlags.Button1Clicked @@ -757,7 +757,7 @@ Item 6", Assert.Equal ("Two", selected); Assert.Equal (1, lv.SelectedItem); - Application.OnMouseEvent ( + Application.RaiseMouseEvent ( new () { ScreenPosition = new (1, 3), Flags = MouseFlags.Button1Clicked @@ -765,7 +765,7 @@ Item 6", Assert.Equal ("Three", selected); Assert.Equal (2, lv.SelectedItem); - Application.OnMouseEvent ( + Application.RaiseMouseEvent ( new () { ScreenPosition = new (1, 4), Flags = MouseFlags.Button1Clicked diff --git a/UnitTests/Views/MenuBarTests.cs b/UnitTests/Views/MenuBarTests.cs index 938001fe1..7ef68bfe2 100644 --- a/UnitTests/Views/MenuBarTests.cs +++ b/UnitTests/Views/MenuBarTests.cs @@ -243,7 +243,7 @@ public class MenuBarTests (ITestOutputHelper output) top.Add (menu, btn); Application.Begin (top); - Application.OnMouseEvent (new () { ScreenPosition = new (0, 4), Flags = MouseFlags.Button1Clicked }); + Application.RaiseMouseEvent (new () { ScreenPosition = new (0, 4), Flags = MouseFlags.Button1Clicked }); Assert.True (btnClicked); top.Dispose (); } @@ -613,7 +613,7 @@ public class MenuBarTests (ITestOutputHelper output) output ); - Application.OnMouseEvent (new () { ScreenPosition = new (20, 5), Flags = MouseFlags.Button1Clicked }); + Application.RaiseMouseEvent (new () { ScreenPosition = new (20, 5), Flags = MouseFlags.Button1Clicked }); firstIteration = false; @@ -646,7 +646,7 @@ public class MenuBarTests (ITestOutputHelper output) { menu.OpenMenu (); - Application.OnMouseEvent (new () { ScreenPosition = new (20, 5 + i), Flags = MouseFlags.Button1Clicked }); + Application.RaiseMouseEvent (new () { ScreenPosition = new (20, 5 + i), Flags = MouseFlags.Button1Clicked }); firstIteration = false; Application.RunIteration (ref rsDialog, ref firstIteration); @@ -809,7 +809,7 @@ public class MenuBarTests (ITestOutputHelper output) output ); - Application.OnMouseEvent (new () { ScreenPosition = new (20, 5), Flags = MouseFlags.Button1Clicked }); + Application.RaiseMouseEvent (new () { ScreenPosition = new (20, 5), Flags = MouseFlags.Button1Clicked }); firstIteration = false; @@ -831,7 +831,7 @@ public class MenuBarTests (ITestOutputHelper output) { menu.OpenMenu (); - Application.OnMouseEvent (new () { ScreenPosition = new (20, 5 + i), Flags = MouseFlags.Button1Clicked }); + Application.RaiseMouseEvent (new () { ScreenPosition = new (20, 5 + i), Flags = MouseFlags.Button1Clicked }); firstIteration = false; Application.RunIteration (ref rs, ref firstIteration); diff --git a/UnitTests/Views/ScrollBarViewTests.cs b/UnitTests/Views/ScrollBarViewTests.cs index 989962d00..01b9e7a49 100644 --- a/UnitTests/Views/ScrollBarViewTests.cs +++ b/UnitTests/Views/ScrollBarViewTests.cs @@ -1176,7 +1176,7 @@ This is a test ", _output ); - Application.OnMouseEvent (new MouseEvent { Position = new (15, 0), Flags = MouseFlags.Button1Clicked }); + Application.RaiseMouseEvent (new MouseEvent { Position = new (15, 0), Flags = MouseFlags.Button1Clicked }); Assert.Null (Application.MouseGrabView); Assert.True (clicked); @@ -1200,7 +1200,7 @@ This is a test ", _output ); - Application.OnMouseEvent (new MouseEvent { Position = new (15, 0), Flags = MouseFlags.Button1Clicked }); + Application.RaiseMouseEvent (new MouseEvent { Position = new (15, 0), Flags = MouseFlags.Button1Clicked }); Assert.Null (Application.MouseGrabView); Assert.True (clicked); diff --git a/UnitTests/Views/ShortcutTests.cs b/UnitTests/Views/ShortcutTests.cs index 711ce243f..160f57439 100644 --- a/UnitTests/Views/ShortcutTests.cs +++ b/UnitTests/Views/ShortcutTests.cs @@ -424,7 +424,7 @@ public class ShortcutTests var accepted = 0; shortcut.Accepting += (s, e) => accepted++; - Application.OnMouseEvent ( + Application.RaiseMouseEvent ( new () { ScreenPosition = new (x, 0), @@ -484,7 +484,7 @@ public class ShortcutTests Application.Top.SetRelativeLayout (new (100, 100)); Application.Top.LayoutSubviews (); - Application.OnMouseEvent ( + Application.RaiseMouseEvent ( new () { ScreenPosition = new (mouseX, 0), @@ -541,7 +541,7 @@ public class ShortcutTests var accepted = 0; shortcut.Accepting += (s, e) => { accepted++; }; - Application.OnMouseEvent ( + Application.RaiseMouseEvent ( new () { ScreenPosition = new (mouseX, 0), @@ -616,7 +616,7 @@ public class ShortcutTests e.Cancel = true; }; - Application.OnMouseEvent ( + Application.RaiseMouseEvent ( new () { ScreenPosition = new (mouseX, 0), diff --git a/UnitTests/Views/TabViewTests.cs b/UnitTests/Views/TabViewTests.cs index dd1d3546d..9d769addc 100644 --- a/UnitTests/Views/TabViewTests.cs +++ b/UnitTests/Views/TabViewTests.cs @@ -144,21 +144,21 @@ public class TabViewTests (ITestOutputHelper output) for (var i = 0; i < 100; i++) { args = new () { ScreenPosition = new (i, 1), Flags = MouseFlags.ReportMousePosition }; - Application.OnMouseEvent (args); + Application.RaiseMouseEvent (args); Application.Refresh (); Assert.Null (clicked); Assert.Equal (tab1, tv.SelectedTab); } args = new () { ScreenPosition = new (3, 1), Flags = MouseFlags.Button1Clicked }; - Application.OnMouseEvent (args); + Application.RaiseMouseEvent (args); Application.Refresh (); Assert.Equal (tab1, clicked); Assert.Equal (tab1, tv.SelectedTab); // Click to tab2 args = new () { ScreenPosition = new (6, 1), Flags = MouseFlags.Button1Clicked }; - Application.OnMouseEvent (args); + Application.RaiseMouseEvent (args); Application.Refresh (); Assert.Equal (tab2, clicked); Assert.Equal (tab2, tv.SelectedTab); @@ -171,7 +171,7 @@ public class TabViewTests (ITestOutputHelper output) }; args = new () { ScreenPosition = new (3, 1), Flags = MouseFlags.Button1Clicked }; - Application.OnMouseEvent (args); + Application.RaiseMouseEvent (args); Application.Refresh (); // Tab 1 was clicked but event handler blocked navigation @@ -179,7 +179,7 @@ public class TabViewTests (ITestOutputHelper output) Assert.Equal (tab2, tv.SelectedTab); args = new () { ScreenPosition = new (12, 1), Flags = MouseFlags.Button1Clicked }; - Application.OnMouseEvent (args); + Application.RaiseMouseEvent (args); Application.Refresh (); // Clicking beyond last tab should raise event with null Tab @@ -234,7 +234,7 @@ public class TabViewTests (ITestOutputHelper output) // Click the right arrow var args = new MouseEvent { ScreenPosition = new (6, 2), Flags = MouseFlags.Button1Clicked }; - Application.OnMouseEvent (args); + Application.RaiseMouseEvent (args); Application.Refresh (); Assert.Null (clicked); Assert.Equal (tab1, oldChanged); @@ -254,7 +254,7 @@ public class TabViewTests (ITestOutputHelper output) // Click the left arrow args = new () { ScreenPosition = new (0, 2), Flags = MouseFlags.Button1Clicked }; - Application.OnMouseEvent (args); + Application.RaiseMouseEvent (args); Application.Refresh (); Assert.Null (clicked); Assert.Equal (tab2, oldChanged); @@ -325,7 +325,7 @@ public class TabViewTests (ITestOutputHelper output) // Click the right arrow var args = new MouseEvent { ScreenPosition = new (7, 3), Flags = MouseFlags.Button1Clicked }; - Application.OnMouseEvent (args); + Application.RaiseMouseEvent (args); Application.Refresh (); Assert.Null (clicked); Assert.Equal (tab1, oldChanged); @@ -347,7 +347,7 @@ public class TabViewTests (ITestOutputHelper output) // Click the left arrow args = new () { ScreenPosition = new (1, 3), Flags = MouseFlags.Button1Clicked }; - Application.OnMouseEvent (args); + Application.RaiseMouseEvent (args); Application.Refresh (); Assert.Null (clicked); Assert.Equal (tab2, oldChanged); diff --git a/UnitTests/Views/TextFieldTests.cs b/UnitTests/Views/TextFieldTests.cs index 0de972262..40b3b8378 100644 --- a/UnitTests/Views/TextFieldTests.cs +++ b/UnitTests/Views/TextFieldTests.cs @@ -1180,13 +1180,13 @@ public class TextFieldTests (ITestOutputHelper output) var mouseEvent = new MouseEvent { Flags = MouseFlags.Button1Clicked, View = tf }; - Application.OnMouseEvent (mouseEvent); + Application.RaiseMouseEvent (mouseEvent); Assert.Equal (1, clickCounter); // Get a fresh instance that represents a right click. // Should be ignored because of SuppressRightClick callback mouseEvent = new () { Flags = MouseFlags.Button3Clicked, View = tf }; - Application.OnMouseEvent (mouseEvent); + Application.RaiseMouseEvent (mouseEvent); Assert.Equal (1, clickCounter); Application.MouseEvent -= HandleRightClick; @@ -1199,7 +1199,7 @@ public class TextFieldTests (ITestOutputHelper output) // This call causes the context menu to pop, and MouseEvent() returns true. // Thus, the clickCounter is NOT incremented. // Which is correct, because the user did NOT click with the left mouse button. - Application.OnMouseEvent (mouseEvent); + Application.RaiseMouseEvent (mouseEvent); Assert.Equal (1, clickCounter); top.Dispose (); diff --git a/UnitTests/Views/ToplevelTests.cs b/UnitTests/Views/ToplevelTests.cs index f5f42b19c..cbf11e4b2 100644 --- a/UnitTests/Views/ToplevelTests.cs +++ b/UnitTests/Views/ToplevelTests.cs @@ -440,7 +440,7 @@ public partial class ToplevelTests (ITestOutputHelper output) Assert.Null (Application.MouseGrabView); // Grab the mouse - Application.OnMouseEvent (new () { ScreenPosition = new (3, 2), Flags = MouseFlags.Button1Pressed }); + Application.RaiseMouseEvent (new () { ScreenPosition = new (3, 2), Flags = MouseFlags.Button1Pressed }); Assert.Equal (Application.Top!.Border, Application.MouseGrabView); Assert.Equal (new (2, 2, 10, 3), Application.Top.Frame); @@ -450,7 +450,7 @@ public partial class ToplevelTests (ITestOutputHelper output) Assert.Equal (Application.Top!.Border, Application.MouseGrabView); // Drag to left - Application.OnMouseEvent ( + Application.RaiseMouseEvent ( new () { ScreenPosition = new (2, 2), Flags = MouseFlags.Button1Pressed @@ -473,7 +473,7 @@ public partial class ToplevelTests (ITestOutputHelper output) Assert.Equal (Application.Top!.Border, Application.MouseGrabView); // Drag up - Application.OnMouseEvent ( + Application.RaiseMouseEvent ( new () { ScreenPosition = new (2, 1), Flags = MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition @@ -496,7 +496,7 @@ public partial class ToplevelTests (ITestOutputHelper output) Assert.Equal (Application.Top!.Border, Application.MouseGrabView); // Ungrab the mouse - Application.OnMouseEvent (new () { ScreenPosition = new (2, 1), Flags = MouseFlags.Button1Released }); + Application.RaiseMouseEvent (new () { ScreenPosition = new (2, 1), Flags = MouseFlags.Button1Released }); Application.Refresh (); Assert.Null (Application.MouseGrabView); @@ -545,7 +545,7 @@ public partial class ToplevelTests (ITestOutputHelper output) Assert.Null (Application.MouseGrabView); // Grab the mouse - Application.OnMouseEvent ( + Application.RaiseMouseEvent ( new () { ScreenPosition = new (win.Frame.X, win.Frame.Y), Flags = MouseFlags.Button1Pressed @@ -561,7 +561,7 @@ public partial class ToplevelTests (ITestOutputHelper output) movex = 1; movey = 0; - Application.OnMouseEvent ( + Application.RaiseMouseEvent ( new () { ScreenPosition = new (win.Frame.X + movex, win.Frame.Y + movey), Flags = @@ -586,7 +586,7 @@ public partial class ToplevelTests (ITestOutputHelper output) movex = 0; movey = -1; - Application.OnMouseEvent ( + Application.RaiseMouseEvent ( new () { ScreenPosition = new (win.Frame.X + movex, win.Frame.Y + movey), Flags = @@ -611,7 +611,7 @@ public partial class ToplevelTests (ITestOutputHelper output) movex = 0; movey = 0; - Application.OnMouseEvent ( + Application.RaiseMouseEvent ( new () { ScreenPosition = new (win.Frame.X + movex, win.Frame.Y + movey), @@ -743,18 +743,18 @@ public partial class ToplevelTests (ITestOutputHelper output) Assert.Equal (new (0, 0, 200, 100), scrollView.Subviews [0].Frame); Assert.Equal (new (3, 3, 194, 94), win.Frame); - Application.OnMouseEvent (new () { ScreenPosition = new (6, 6), Flags = MouseFlags.Button1Pressed }); + Application.RaiseMouseEvent (new () { ScreenPosition = new (6, 6), Flags = MouseFlags.Button1Pressed }); Assert.Equal (win.Border, Application.MouseGrabView); Assert.Equal (new (3, 3, 194, 94), win.Frame); - Application.OnMouseEvent (new () { ScreenPosition = new (9, 9), Flags = MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition }); + Application.RaiseMouseEvent (new () { ScreenPosition = new (9, 9), Flags = MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition }); Assert.Equal (win.Border, Application.MouseGrabView); top.SetNeedsLayout (); top.LayoutSubviews (); Assert.Equal (new (6, 6, 191, 91), win.Frame); Application.Refresh (); - Application.OnMouseEvent ( + Application.RaiseMouseEvent ( new () { ScreenPosition = new (5, 5), Flags = MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition @@ -765,12 +765,12 @@ public partial class ToplevelTests (ITestOutputHelper output) Assert.Equal (new (2, 2, 195, 95), win.Frame); Application.Refresh (); - Application.OnMouseEvent (new () { ScreenPosition = new (5, 5), Flags = MouseFlags.Button1Released }); + Application.RaiseMouseEvent (new () { ScreenPosition = new (5, 5), Flags = MouseFlags.Button1Released }); // ScrollView always grab the mouse when the container's subview OnMouseEnter don't want grab the mouse Assert.Equal (scrollView, Application.MouseGrabView); - Application.OnMouseEvent (new () { ScreenPosition = new (4, 4), Flags = MouseFlags.ReportMousePosition }); + Application.RaiseMouseEvent (new () { ScreenPosition = new (4, 4), Flags = MouseFlags.ReportMousePosition }); Assert.Equal (scrollView, Application.MouseGrabView); top.Dispose (); } @@ -790,11 +790,11 @@ public partial class ToplevelTests (ITestOutputHelper output) Assert.Null (Application.MouseGrabView); - Application.OnMouseEvent (new () { ScreenPosition = new (0, 0), Flags = MouseFlags.Button1Pressed }); + Application.RaiseMouseEvent (new () { ScreenPosition = new (0, 0), Flags = MouseFlags.Button1Pressed }); Assert.Equal (window.Border, Application.MouseGrabView); - Application.OnMouseEvent ( + Application.RaiseMouseEvent ( new () { ScreenPosition = new (-11, -4), Flags = MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition @@ -807,7 +807,7 @@ public partial class ToplevelTests (ITestOutputHelper output) // Changes Top size to same size as Dialog more menu and scroll bar ((FakeDriver)Application.Driver!).SetBufferSize (20, 3); - Application.OnMouseEvent ( + Application.RaiseMouseEvent ( new () { ScreenPosition = new (-1, -1), Flags = MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition @@ -820,7 +820,7 @@ public partial class ToplevelTests (ITestOutputHelper output) // Changes Top size smaller than Dialog size ((FakeDriver)Application.Driver!).SetBufferSize (19, 2); - Application.OnMouseEvent ( + Application.RaiseMouseEvent ( new () { ScreenPosition = new (-1, -1), Flags = MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition @@ -830,7 +830,7 @@ public partial class ToplevelTests (ITestOutputHelper output) Assert.Equal (new (0, 0, 19, 2), top.Frame); Assert.Equal (new (-1, -1, 20, 3), window.Frame); - Application.OnMouseEvent ( + Application.RaiseMouseEvent ( new () { ScreenPosition = new (18, 1), Flags = MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition @@ -841,7 +841,7 @@ public partial class ToplevelTests (ITestOutputHelper output) Assert.Equal (new (18, 1, 20, 3), window.Frame); // On a real app we can't go beyond the SuperView bounds - Application.OnMouseEvent ( + Application.RaiseMouseEvent ( new () { ScreenPosition = new (19, 2), Flags = MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition @@ -882,7 +882,7 @@ public partial class ToplevelTests (ITestOutputHelper output) Assert.Null (Application.MouseGrabView); Assert.Equal (new (0, 0, 10, 3), window.Frame); - Application.OnMouseEvent (new () { ScreenPosition = new (0, 0), Flags = MouseFlags.Button1Pressed }); + Application.RaiseMouseEvent (new () { ScreenPosition = new (0, 0), Flags = MouseFlags.Button1Pressed }); var firstIteration = false; Application.RunIteration (ref rs, ref firstIteration); @@ -890,7 +890,7 @@ public partial class ToplevelTests (ITestOutputHelper output) Assert.Equal (new (0, 0, 10, 3), window.Frame); - Application.OnMouseEvent ( + Application.RaiseMouseEvent ( new () { ScreenPosition = new (1, 1), Flags = MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition @@ -984,7 +984,7 @@ public partial class ToplevelTests (ITestOutputHelper output) Assert.Equal (new (2, 1, 15, 10), testWindow.Frame); - Application.OnMouseEvent (new () { ScreenPosition = new (5, 2), Flags = MouseFlags.Button1Clicked }); + Application.RaiseMouseEvent (new () { ScreenPosition = new (5, 2), Flags = MouseFlags.Button1Clicked }); Application.Refresh ();