From bd8edbe201b10bf9d7a9332342866dc9c2dc5399 Mon Sep 17 00:00:00 2001 From: Tig Kindel Date: Thu, 29 Feb 2024 17:29:25 -0700 Subject: [PATCH] Merged MouseEvent() and OnMouseEvent() --- .../Text/Autocomplete/AppendAutocomplete.cs | 2 +- .../Text/Autocomplete/AutocompleteBase.cs | 2 +- .../Text/Autocomplete/IAutocomplete.cs | 2 +- .../Autocomplete/PopupAutocomplete.PopUp.cs | 2 +- .../Text/Autocomplete/PopupAutocomplete.cs | 2 +- Terminal.Gui/View/ViewMouse.cs | 10 +-- Terminal.Gui/Views/Button.cs | 2 +- Terminal.Gui/Views/CheckBox.cs | 2 +- Terminal.Gui/Views/ColorPicker.cs | 2 +- Terminal.Gui/Views/ComboBox.cs | 6 +- Terminal.Gui/Views/DateField.cs | 4 +- Terminal.Gui/Views/HexView.cs | 2 +- Terminal.Gui/Views/Label.cs | 8 +- Terminal.Gui/Views/ListView.cs | 2 +- Terminal.Gui/Views/Menu/Menu.cs | 4 +- Terminal.Gui/Views/Menu/MenuBar.cs | 4 +- Terminal.Gui/Views/RadioGroup.cs | 2 +- Terminal.Gui/Views/ScrollBarView.cs | 6 +- Terminal.Gui/Views/ScrollView.cs | 6 +- Terminal.Gui/Views/Slider.cs | 2 +- Terminal.Gui/Views/StatusBar.cs | 2 +- Terminal.Gui/Views/TabView.cs | 4 +- Terminal.Gui/Views/TableView/TableView.cs | 6 +- Terminal.Gui/Views/TextField.cs | 8 +- Terminal.Gui/Views/TextValidateField.cs | 2 +- Terminal.Gui/Views/TextView.cs | 4 +- Terminal.Gui/Views/TileView.cs | 2 +- Terminal.Gui/Views/TimeField.cs | 4 +- Terminal.Gui/Views/Toplevel.cs | 2 +- Terminal.Gui/Views/TreeView/TreeView.cs | 4 +- UnitTests/Application/KeyboardTests.cs | 8 +- UnitTests/Application/MouseTests.cs | 24 +++--- UnitTests/Input/ResponderTests.cs | 14 ++-- UnitTests/Text/AutocompleteTests.cs | 2 +- UnitTests/View/NavigationTests.cs | 8 +- UnitTests/View/ViewTests.cs | 2 +- UnitTests/Views/CheckBoxTests.cs | 6 +- UnitTests/Views/ColorPickerTests.cs | 4 +- UnitTests/Views/ComboBoxTests.cs | 54 ++++++------- UnitTests/Views/ContextMenuTests.cs | 14 ++-- UnitTests/Views/ListViewTests.cs | 10 +-- UnitTests/Views/MenuBarTests.cs | 76 +++++++++---------- UnitTests/Views/StatusBarTests.cs | 2 +- UnitTests/Views/TableViewTests.cs | 14 ++-- UnitTests/Views/TextFieldTests.cs | 16 ++-- UnitTests/Views/TextValidateFieldTests.cs | 2 +- UnitTests/Views/TextViewTests.cs | 34 ++++----- UnitTests/Views/ToplevelTests.cs | 6 +- UnitTests/Views/TreeViewTests.cs | 8 +- 49 files changed, 209 insertions(+), 205 deletions(-) diff --git a/Terminal.Gui/Text/Autocomplete/AppendAutocomplete.cs b/Terminal.Gui/Text/Autocomplete/AppendAutocomplete.cs index 887d09791..ba5fbed5a 100644 --- a/Terminal.Gui/Text/Autocomplete/AppendAutocomplete.cs +++ b/Terminal.Gui/Text/Autocomplete/AppendAutocomplete.cs @@ -59,7 +59,7 @@ public class AppendAutocomplete : AutocompleteBase } /// - public override bool MouseEvent (MouseEvent me, bool fromHost = false) { return false; } + public override bool OnMouseEvent (MouseEvent me, bool fromHost = false) { return false; } /// public override bool ProcessKey (Key a) diff --git a/Terminal.Gui/Text/Autocomplete/AutocompleteBase.cs b/Terminal.Gui/Text/Autocomplete/AutocompleteBase.cs index 3dfe4955e..7e6ff1e55 100644 --- a/Terminal.Gui/Text/Autocomplete/AutocompleteBase.cs +++ b/Terminal.Gui/Text/Autocomplete/AutocompleteBase.cs @@ -52,7 +52,7 @@ public abstract class AutocompleteBase : IAutocomplete public virtual AutocompleteContext Context { get; set; } /// - public abstract bool MouseEvent (MouseEvent me, bool fromHost = false); + public abstract bool OnMouseEvent (MouseEvent me, bool fromHost = false); /// public abstract bool ProcessKey (Key a); diff --git a/Terminal.Gui/Text/Autocomplete/IAutocomplete.cs b/Terminal.Gui/Text/Autocomplete/IAutocomplete.cs index ca0e36a8a..9eac86876 100644 --- a/Terminal.Gui/Text/Autocomplete/IAutocomplete.cs +++ b/Terminal.Gui/Text/Autocomplete/IAutocomplete.cs @@ -72,7 +72,7 @@ public interface IAutocomplete /// The mouse event. /// If was called from the popup or from the host. /// trueif the mouse can be handled falseotherwise. - bool MouseEvent (MouseEvent me, bool fromHost = false); + bool OnMouseEvent (MouseEvent me, bool fromHost = false); /// /// Handle key events before e.g. to make key events like up/down apply to the diff --git a/Terminal.Gui/Text/Autocomplete/PopupAutocomplete.PopUp.cs b/Terminal.Gui/Text/Autocomplete/PopupAutocomplete.PopUp.cs index 6fab05072..f3522676b 100644 --- a/Terminal.Gui/Text/Autocomplete/PopupAutocomplete.PopUp.cs +++ b/Terminal.Gui/Text/Autocomplete/PopupAutocomplete.PopUp.cs @@ -14,7 +14,7 @@ public abstract partial class PopupAutocomplete WantMousePositionReports = true; } - public override bool MouseEvent (MouseEvent mouseEvent) { return _autoComplete.MouseEvent (mouseEvent); } + public override bool OnMouseEvent (MouseEvent mouseEvent) { return _autoComplete.OnMouseEvent (mouseEvent); } public override void OnDrawContent (Rectangle contentArea) { diff --git a/Terminal.Gui/Text/Autocomplete/PopupAutocomplete.cs b/Terminal.Gui/Text/Autocomplete/PopupAutocomplete.cs index cf71abf5a..84ea48365 100644 --- a/Terminal.Gui/Text/Autocomplete/PopupAutocomplete.cs +++ b/Terminal.Gui/Text/Autocomplete/PopupAutocomplete.cs @@ -86,7 +86,7 @@ public abstract partial class PopupAutocomplete : AutocompleteBase /// The mouse event. /// If was called from the popup or from the host. /// trueif the mouse can be handled falseotherwise. - public override bool MouseEvent (MouseEvent me, bool fromHost = false) + public override bool OnMouseEvent (MouseEvent me, bool fromHost = false) { if (fromHost) { diff --git a/Terminal.Gui/View/ViewMouse.cs b/Terminal.Gui/View/ViewMouse.cs index 06255fad9..8c54f4394 100644 --- a/Terminal.Gui/View/ViewMouse.cs +++ b/Terminal.Gui/View/ViewMouse.cs @@ -44,7 +44,7 @@ public partial class View /// /// true, if the event was handled, false otherwise. /// Contains the details about the mouse event. - public virtual bool MouseEvent (MouseEvent mouseEvent) { return false; } + //public virtual bool MouseEvent (MouseEvent mouseEvent) { return false; } /// Method invoked when a mouse event is generated @@ -64,10 +64,10 @@ public partial class View var args = new MouseEventEventArgs (mouseEvent); - if (MouseEvent (mouseEvent)) - { - return true; - } + //if (MouseEvent (mouseEvent)) + //{ + // return true; + //} if (mouseEvent.Flags == MouseFlags.Button1Clicked) { diff --git a/Terminal.Gui/Views/Button.cs b/Terminal.Gui/Views/Button.cs index 7d7687895..c17014ea3 100644 --- a/Terminal.Gui/Views/Button.cs +++ b/Terminal.Gui/Views/Button.cs @@ -100,7 +100,7 @@ public class Button : View public bool NoPadding { get; set; } /// - public override bool MouseEvent (MouseEvent me) + public override bool OnMouseEvent (MouseEvent me) { if (me.Flags == MouseFlags.Button1Clicked) { diff --git a/Terminal.Gui/Views/CheckBox.cs b/Terminal.Gui/Views/CheckBox.cs index 9f5f2aadb..cdf081aaa 100644 --- a/Terminal.Gui/Views/CheckBox.cs +++ b/Terminal.Gui/Views/CheckBox.cs @@ -88,7 +88,7 @@ public class CheckBox : View } /// - public override bool MouseEvent (MouseEvent me) + public override bool OnMouseEvent (MouseEvent me) { if (!me.Flags.HasFlag (MouseFlags.Button1Clicked) || !CanFocus) { diff --git a/Terminal.Gui/Views/ColorPicker.cs b/Terminal.Gui/Views/ColorPicker.cs index 8c0396b31..17b9b7840 100644 --- a/Terminal.Gui/Views/ColorPicker.cs +++ b/Terminal.Gui/Views/ColorPicker.cs @@ -89,7 +89,7 @@ public class ColorPicker : View public event EventHandler ColorChanged; /// - public override bool MouseEvent (MouseEvent me) + public override bool OnMouseEvent (MouseEvent me) { if (!me.Flags.HasFlag (MouseFlags.Button1Clicked) || !CanFocus) { diff --git a/Terminal.Gui/Views/ComboBox.cs b/Terminal.Gui/Views/ComboBox.cs index cc8b1fd26..9733cd26f 100644 --- a/Terminal.Gui/Views/ComboBox.cs +++ b/Terminal.Gui/Views/ComboBox.cs @@ -243,7 +243,7 @@ public class ComboBox : View public event EventHandler Expanded; /// - public override bool MouseEvent (MouseEvent me) + public override bool OnMouseEvent (MouseEvent me) { if (me.X == Bounds.Right - 1 && me.Y == Bounds.Top @@ -794,14 +794,14 @@ public class ComboBox : View set => _hideDropdownListOnClick = WantContinuousButtonPressed = value; } - public override bool MouseEvent (MouseEvent me) + public override bool OnMouseEvent (MouseEvent me) { var res = false; bool isMousePositionValid = IsMousePositionValid (me); if (isMousePositionValid) { - res = base.MouseEvent (me); + res = base.OnMouseEvent (me); } if (HideDropdownListOnClick && me.Flags == MouseFlags.Button1Clicked) diff --git a/Terminal.Gui/Views/DateField.cs b/Terminal.Gui/Views/DateField.cs index 21059992c..c4eea080c 100644 --- a/Terminal.Gui/Views/DateField.cs +++ b/Terminal.Gui/Views/DateField.cs @@ -114,9 +114,9 @@ public class DateField : TextField } /// - public override bool MouseEvent (MouseEvent ev) + public override bool OnMouseEvent (MouseEvent ev) { - bool result = base.MouseEvent (ev); + bool result = base.OnMouseEvent (ev); if (result && SelectedLength == 0 && ev.Flags.HasFlag (MouseFlags.Button1Pressed)) { diff --git a/Terminal.Gui/Views/HexView.cs b/Terminal.Gui/Views/HexView.cs index 700f322c1..e500e7630 100644 --- a/Terminal.Gui/Views/HexView.cs +++ b/Terminal.Gui/Views/HexView.cs @@ -262,7 +262,7 @@ public class HexView : View public event EventHandler Edited; /// - public override bool MouseEvent (MouseEvent me) + public override bool OnMouseEvent (MouseEvent me) { // BUGBUG: Test this with a border! Assumes Frame == Bounds! diff --git a/Terminal.Gui/Views/Label.cs b/Terminal.Gui/Views/Label.cs index 5f04cfee3..e2d126754 100644 --- a/Terminal.Gui/Views/Label.cs +++ b/Terminal.Gui/Views/Label.cs @@ -78,10 +78,10 @@ public class Label : View return true; } - if (MouseEvent (mouseEvent)) - { - return true; - } + //if (MouseEvent (mouseEvent)) + //{ + // return true; + //} if (mouseEvent.Flags == MouseFlags.Button1Clicked) { diff --git a/Terminal.Gui/Views/ListView.cs b/Terminal.Gui/Views/ListView.cs index 7efc1f25f..07a771581 100644 --- a/Terminal.Gui/Views/ListView.cs +++ b/Terminal.Gui/Views/ListView.cs @@ -347,7 +347,7 @@ public class ListView : View } /// - public override bool MouseEvent (MouseEvent me) + public override bool OnMouseEvent (MouseEvent me) { if (!me.Flags.HasFlag (MouseFlags.Button1Clicked) && !me.Flags.HasFlag (MouseFlags.Button1DoubleClicked) diff --git a/Terminal.Gui/Views/Menu/Menu.cs b/Terminal.Gui/Views/Menu/Menu.cs index 37de2476b..8f91f4108 100644 --- a/Terminal.Gui/Views/Menu/Menu.cs +++ b/Terminal.Gui/Views/Menu/Menu.cs @@ -744,7 +744,7 @@ internal sealed class Menu : View View = view }; - if (MouseEvent (nme) || a.MouseEvent.Flags == MouseFlags.Button1Pressed || a.MouseEvent.Flags == MouseFlags.Button1Released) + if (OnMouseEvent (nme) || a.MouseEvent.Flags == MouseFlags.Button1Pressed || a.MouseEvent.Flags == MouseFlags.Button1Released) { a.MouseEvent.Handled = true; } @@ -1183,7 +1183,7 @@ internal sealed class Menu : View _host?.SetNeedsDisplay (); } - public override bool MouseEvent (MouseEvent me) + public override bool OnMouseEvent (MouseEvent me) { if (!_host._handled && !_host.HandleGrabView (me, this)) { diff --git a/Terminal.Gui/Views/Menu/MenuBar.cs b/Terminal.Gui/Views/Menu/MenuBar.cs index 165d9721d..41396da15 100644 --- a/Terminal.Gui/Views/Menu/MenuBar.cs +++ b/Terminal.Gui/Views/Menu/MenuBar.cs @@ -1647,7 +1647,7 @@ public class MenuBar : View } /// - public override bool MouseEvent (MouseEvent me) + public override bool OnMouseEvent (MouseEvent me) { if (!_handled && !HandleGrabView (me, this)) { @@ -1805,7 +1805,7 @@ public class MenuBar : View nme = new MouseEvent { X = me.X + current.Frame.X, Y = 0, Flags = me.Flags, View = v }; } - v.MouseEvent (nme); + v.OnMouseEvent (nme); return false; } diff --git a/Terminal.Gui/Views/RadioGroup.cs b/Terminal.Gui/Views/RadioGroup.cs index cc53cf0bd..0b3f18ed5 100644 --- a/Terminal.Gui/Views/RadioGroup.cs +++ b/Terminal.Gui/Views/RadioGroup.cs @@ -161,7 +161,7 @@ public class RadioGroup : View } /// - public override bool MouseEvent (MouseEvent me) + public override bool OnMouseEvent (MouseEvent me) { if (!me.Flags.HasFlag (MouseFlags.Button1Clicked)) { diff --git a/Terminal.Gui/Views/ScrollBarView.cs b/Terminal.Gui/Views/ScrollBarView.cs index 7cb47ffd4..4f271467a 100644 --- a/Terminal.Gui/Views/ScrollBarView.cs +++ b/Terminal.Gui/Views/ScrollBarView.cs @@ -275,7 +275,7 @@ public class ScrollBarView : View public event EventHandler ChangedPosition; /// - public override bool MouseEvent (MouseEvent mouseEvent) + public override bool OnMouseEvent (MouseEvent mouseEvent) { if (mouseEvent.Flags != MouseFlags.Button1Pressed && mouseEvent.Flags != MouseFlags.Button1DoubleClicked @@ -325,7 +325,7 @@ public class ScrollBarView : View || mouseEvent.Flags == MouseFlags.WheeledRight || mouseEvent.Flags == MouseFlags.WheeledLeft)) { - return Host.MouseEvent (mouseEvent); + return Host.OnMouseEvent (mouseEvent); } if (mouseEvent.Flags == MouseFlags.Button1Pressed && location == 0) @@ -800,7 +800,7 @@ public class ScrollBarView : View || me.MouseEvent.Flags == MouseFlags.WheeledRight || me.MouseEvent.Flags == MouseFlags.WheeledLeft) { - MouseEvent (me.MouseEvent); + OnMouseEvent (me.MouseEvent); } else if (me.MouseEvent.Flags == MouseFlags.Button1Clicked) { diff --git a/Terminal.Gui/Views/ScrollView.cs b/Terminal.Gui/Views/ScrollView.cs index 89fb1d666..96d56aa5c 100644 --- a/Terminal.Gui/Views/ScrollView.cs +++ b/Terminal.Gui/Views/ScrollView.cs @@ -334,7 +334,7 @@ public class ScrollView : View } /// - public override bool MouseEvent (MouseEvent me) + public override bool OnMouseEvent (MouseEvent me) { if (me.Flags != MouseFlags.WheeledDown && me.Flags != MouseFlags.WheeledUp @@ -366,11 +366,11 @@ public class ScrollView : View } else if (me.X == _vertical.Frame.X && ShowVerticalScrollIndicator) { - _vertical.MouseEvent (me); + _vertical.OnMouseEvent (me); } else if (me.Y == _horizontal.Frame.Y && ShowHorizontalScrollIndicator) { - _horizontal.MouseEvent (me); + _horizontal.OnMouseEvent (me); } else if (IsOverridden (me.View, "MouseEvent")) { diff --git a/Terminal.Gui/Views/Slider.cs b/Terminal.Gui/Views/Slider.cs index 4e3aae25c..661e0921f 100644 --- a/Terminal.Gui/Views/Slider.cs +++ b/Terminal.Gui/Views/Slider.cs @@ -1522,7 +1522,7 @@ public class Slider : View private Point? _moveRenderPosition; /// - public override bool MouseEvent (MouseEvent mouseEvent) + public override bool OnMouseEvent (MouseEvent mouseEvent) { // Note(jmperricone): Maybe we click to focus the cursor, and on next click we set the option. // That will makes OptionFocused Event more relevant. diff --git a/Terminal.Gui/Views/StatusBar.cs b/Terminal.Gui/Views/StatusBar.cs index d4c7c03d4..ba8eda63a 100644 --- a/Terminal.Gui/Views/StatusBar.cs +++ b/Terminal.Gui/Views/StatusBar.cs @@ -142,7 +142,7 @@ public class StatusBar : View } /// - public override bool MouseEvent (MouseEvent me) + public override bool OnMouseEvent (MouseEvent me) { if (me.Flags != MouseFlags.Button1Clicked) { diff --git a/Terminal.Gui/Views/TabView.cs b/Terminal.Gui/Views/TabView.cs index a8874a1cc..dd8b9f5a8 100644 --- a/Terminal.Gui/Views/TabView.cs +++ b/Terminal.Gui/Views/TabView.cs @@ -533,7 +533,7 @@ public class TabView : View return Style.ShowTopLine ? 3 : 2; } - private void Tab_MouseClick (object sender, MouseEventEventArgs e) { e.Handled = _tabsBar.MouseEvent (e.MouseEvent); } + private void Tab_MouseClick (object sender, MouseEventEventArgs e) { e.Handled = _tabsBar.OnMouseEvent (e.MouseEvent); } private void UnSetCurrentTabs () { @@ -590,7 +590,7 @@ public class TabView : View Add (_rightScrollIndicator, _leftScrollIndicator); } - public override bool MouseEvent (MouseEvent me) + public override bool OnMouseEvent (MouseEvent me) { Tab hit = me.View is Tab ? (Tab)me.View : null; diff --git a/Terminal.Gui/Views/TableView/TableView.cs b/Terminal.Gui/Views/TableView/TableView.cs index 2d906d9d6..b44c6a536 100644 --- a/Terminal.Gui/Views/TableView/TableView.cs +++ b/Terminal.Gui/Views/TableView/TableView.cs @@ -787,7 +787,7 @@ public class TableView : View } /// - public override bool MouseEvent (MouseEvent me) + public override bool OnMouseEvent (MouseEvent me) { if (!me.Flags.HasFlag (MouseFlags.Button1Clicked) && !me.Flags.HasFlag (MouseFlags.Button1DoubleClicked) @@ -796,7 +796,7 @@ public class TableView : View && me.Flags != MouseFlags.WheeledLeft && me.Flags != MouseFlags.WheeledRight) { - return false; + return base.OnMouseEvent (me); } if (!HasFocus && CanFocus) @@ -892,7 +892,7 @@ public class TableView : View } } - return false; + return base.OnMouseEvent (me); } /// diff --git a/Terminal.Gui/Views/TextField.cs b/Terminal.Gui/Views/TextField.cs index a99dacd7d..b4e9f507e 100644 --- a/Terminal.Gui/Views/TextField.cs +++ b/Terminal.Gui/Views/TextField.cs @@ -343,7 +343,7 @@ public class TextField : View // OnAccept returns true if the event is canceled. // By Default pressing ENTER should be ignored (Invoke(Command.Accept) should return false). - AddCommand (Command.Accept, () => OnAccept() != true); + AddCommand (Command.Accept, () => OnAccept () != true); // Default keybindings for this view // We follow this as closely as possible: https://en.wikipedia.org/wiki/Table_of_keyboard_shortcuts @@ -846,7 +846,7 @@ public class TextField : View } /// - public override bool MouseEvent (MouseEvent ev) + public override bool OnMouseEvent (MouseEvent ev) { if (!ev.Flags.HasFlag (MouseFlags.Button1Pressed) && !ev.Flags.HasFlag (MouseFlags.ReportMousePosition) @@ -855,7 +855,7 @@ public class TextField : View && !ev.Flags.HasFlag (MouseFlags.Button1TripleClicked) && !ev.Flags.HasFlag (ContextMenu.MouseFlags)) { - return false; + return base.OnMouseEvent (ev); } if (!CanFocus) @@ -869,7 +869,7 @@ public class TextField : View } // Give autocomplete first opportunity to respond to mouse clicks - if (SelectedLength == 0 && Autocomplete.MouseEvent (ev, true)) + if (SelectedLength == 0 && Autocomplete.OnMouseEvent (ev, true)) { return true; } diff --git a/Terminal.Gui/Views/TextValidateField.cs b/Terminal.Gui/Views/TextValidateField.cs index ae99aba04..f1c37aa37 100644 --- a/Terminal.Gui/Views/TextValidateField.cs +++ b/Terminal.Gui/Views/TextValidateField.cs @@ -533,7 +533,7 @@ namespace Terminal.Gui } /// - public override bool MouseEvent (MouseEvent mouseEvent) + public override bool OnMouseEvent (MouseEvent mouseEvent) { if (mouseEvent.Flags.HasFlag (MouseFlags.Button1Pressed)) { diff --git a/Terminal.Gui/Views/TextView.cs b/Terminal.Gui/Views/TextView.cs index 64bbb709c..9eb6d47d5 100644 --- a/Terminal.Gui/Views/TextView.cs +++ b/Terminal.Gui/Views/TextView.cs @@ -3319,7 +3319,7 @@ public class TextView : View } /// - public override bool MouseEvent (MouseEvent ev) + public override bool OnMouseEvent (MouseEvent ev) { if (!ev.Flags.HasFlag (MouseFlags.Button1Clicked) && !ev.Flags.HasFlag (MouseFlags.Button1Pressed) @@ -3349,7 +3349,7 @@ public class TextView : View _continuousFind = false; // Give autocomplete first opportunity to respond to mouse clicks - if (SelectedLength == 0 && Autocomplete.MouseEvent (ev, true)) + if (SelectedLength == 0 && Autocomplete.OnMouseEvent (ev, true)) { return true; } diff --git a/Terminal.Gui/Views/TileView.cs b/Terminal.Gui/Views/TileView.cs index 4fbf2ff85..aa71bf375 100644 --- a/Terminal.Gui/Views/TileView.cs +++ b/Terminal.Gui/Views/TileView.cs @@ -901,7 +901,7 @@ public class TileView : View } } - public override bool MouseEvent (MouseEvent mouseEvent) + public override bool OnMouseEvent (MouseEvent mouseEvent) { if (!dragPosition.HasValue && mouseEvent.Flags == MouseFlags.Button1Pressed) { diff --git a/Terminal.Gui/Views/TimeField.cs b/Terminal.Gui/Views/TimeField.cs index 2779c2f83..afdf12841 100644 --- a/Terminal.Gui/Views/TimeField.cs +++ b/Terminal.Gui/Views/TimeField.cs @@ -163,9 +163,9 @@ public class TimeField : TextField } /// - public override bool MouseEvent (MouseEvent ev) + public override bool OnMouseEvent (MouseEvent ev) { - bool result = base.MouseEvent (ev); + bool result = base.OnMouseEvent (ev); if (result && SelectedLength == 0 && ev.Flags.HasFlag (MouseFlags.Button1Pressed)) { diff --git a/Terminal.Gui/Views/Toplevel.cs b/Terminal.Gui/Views/Toplevel.cs index 92d801e61..af042c925 100644 --- a/Terminal.Gui/Views/Toplevel.cs +++ b/Terminal.Gui/Views/Toplevel.cs @@ -237,7 +237,7 @@ public partial class Toplevel : View public event EventHandler Loaded; /// - public override bool MouseEvent (MouseEvent mouseEvent) + public override bool OnMouseEvent (MouseEvent mouseEvent) { if (!CanFocus) { diff --git a/Terminal.Gui/Views/TreeView/TreeView.cs b/Terminal.Gui/Views/TreeView/TreeView.cs index 96b5941c8..a2d9569d2 100644 --- a/Terminal.Gui/Views/TreeView/TreeView.cs +++ b/Terminal.Gui/Views/TreeView/TreeView.cs @@ -1001,7 +1001,7 @@ public class TreeView : View, ITreeView where T : class public bool IsSelected (T model) { return Equals (SelectedObject, model) || (MultiSelect && multiSelectedRegions.Any (s => s.Contains (model))); } /// - public override bool MouseEvent (MouseEvent me) + public override bool OnMouseEvent (MouseEvent me) { // If it is not an event we care about if (!me.Flags.HasFlag (MouseFlags.Button1Clicked) @@ -1012,7 +1012,7 @@ public class TreeView : View, ITreeView where T : class && !me.Flags.HasFlag (MouseFlags.WheeledLeft)) { // do nothing - return false; + return base.OnMouseEvent (me); } if (!HasFocus && CanFocus) diff --git a/UnitTests/Application/KeyboardTests.cs b/UnitTests/Application/KeyboardTests.cs index c0ea94343..1d33f4a23 100644 --- a/UnitTests/Application/KeyboardTests.cs +++ b/UnitTests/Application/KeyboardTests.cs @@ -172,13 +172,13 @@ public class KeyboardTests Assert.True (win2.HasFocus); Assert.Equal ("win2", ((Window)top.Subviews [top.Subviews.Count - 1]).Title); - win.MouseEvent (new MouseEvent { Flags = MouseFlags.Button1Pressed }); + win.OnMouseEvent (new MouseEvent { Flags = MouseFlags.Button1Pressed }); Assert.False (win.CanFocus); Assert.False (win.HasFocus); Assert.True (win2.CanFocus); Assert.True (win2.HasFocus); Assert.Equal ("win2", ((Window)top.Subviews [top.Subviews.Count - 1]).Title); - win2.MouseEvent (new MouseEvent { Flags = MouseFlags.Button1Released }); + win2.OnMouseEvent (new MouseEvent { Flags = MouseFlags.Button1Released }); Assert.Null (Toplevel._dragPosition); } @@ -233,13 +233,13 @@ public class KeyboardTests Assert.False (win2.HasFocus); Assert.Equal ("win", ((Window)top.Subviews [top.Subviews.Count - 1]).Title); - win2.MouseEvent (new MouseEvent { Flags = MouseFlags.Button1Pressed }); + win2.OnMouseEvent (new MouseEvent { Flags = MouseFlags.Button1Pressed }); Assert.True (win.CanFocus); Assert.False (win.HasFocus); Assert.True (win2.CanFocus); Assert.True (win2.HasFocus); Assert.Equal ("win2", ((Window)top.Subviews [top.Subviews.Count - 1]).Title); - win2.MouseEvent (new MouseEvent { Flags = MouseFlags.Button1Released }); + win2.OnMouseEvent (new MouseEvent { Flags = MouseFlags.Button1Released }); Assert.Null (Toplevel._dragPosition); } diff --git a/UnitTests/Application/MouseTests.cs b/UnitTests/Application/MouseTests.cs index b52d0a2cd..8c0791070 100644 --- a/UnitTests/Application/MouseTests.cs +++ b/UnitTests/Application/MouseTests.cs @@ -60,11 +60,11 @@ public class MouseTests } /// - /// Tests that the mouse coordinates passed to the focused view are correct when the mouse is clicked. No frames; + /// Tests that the mouse coordinates passed to the focused view are correct when the mouse is clicked. No adornments; /// Frame == Bounds /// - [AutoInitShutdown] [Theory] + [AutoInitShutdown] // click inside view tests [InlineData (0, 0, 0, 0, 0, true)] @@ -94,7 +94,7 @@ public class MouseTests [InlineData (1, 0, 1, 0, 0, false)] [InlineData (1, 9, 0, 0, 0, false)] [InlineData (1, 0, 9, 0, 0, false)] - public void MouseCoordinatesTest_NoFrames ( + public void MouseCoordinatesTest_NoAdornments ( int offset, int clickX, int clickY, @@ -107,23 +107,27 @@ public class MouseTests Point pos = new (offset, offset); var clicked = false; - Application.Top.X = pos.X; - Application.Top.Y = pos.Y; - Application.Top.Width = size.Width; - Application.Top.Height = size.Height; - - Application.Begin (Application.Top); + var view = new View () + { + X = pos.X, + Y = pos.Y, + Width = size.Width, + Height = size.Height + }; + view.BeginInit(); + view.EndInit(); var mouseEvent = new MouseEvent { X = clickX, Y = clickY, Flags = MouseFlags.Button1Clicked }; var mouseEventArgs = new MouseEventEventArgs (mouseEvent); - Application.Top.MouseClick += (s, e) => + view.MouseClick += (s, e) => { Assert.Equal (expectedX, e.MouseEvent.X); Assert.Equal (expectedY, e.MouseEvent.Y); clicked = true; }; + Application.Top.Add (view); Application.OnMouseEvent (mouseEventArgs); Assert.Equal (expectedClicked, clicked); } diff --git a/UnitTests/Input/ResponderTests.cs b/UnitTests/Input/ResponderTests.cs index 5bed85257..a2f84b8a1 100644 --- a/UnitTests/Input/ResponderTests.cs +++ b/UnitTests/Input/ResponderTests.cs @@ -161,8 +161,8 @@ public class ResponderTests // MouseEvent is defined on Responder IS overriden on ScrollBarView (but not View) Assert.True ( Responder.IsOverridden ( - new ScrollBarView { Text = "ScrollBarView overrides MouseEvent" }, - "MouseEvent" + new ScrollBarView { Text = "ScrollBarView overrides OnMouseEvent" }, + "OnMouseEvent" ) ); @@ -180,8 +180,8 @@ public class ResponderTests // ScrollBarView overrides both MouseEvent (from Responder) and Redraw (from View) Assert.True ( Responder.IsOverridden ( - new ScrollBarView { Text = "ScrollBarView overrides MouseEvent" }, - "MouseEvent" + new ScrollBarView { Text = "ScrollBarView overrides OnMouseEvent" }, + "OnMouseEvent" ) ); @@ -194,8 +194,8 @@ public class ResponderTests Assert.True ( Responder.IsOverridden ( - new Button { Text = "Button overrides MouseEvent" }, - "MouseEvent" + new Button { Text = "Button overrides OnMouseEvent" }, + "OnMouseEvent" ) ); #if DEBUG_IDISPOSABLE @@ -245,7 +245,7 @@ public class ResponderTests //Assert.False (r.OnKeyDown (new KeyEventArgs () { Key = Key.Unknown })); Assert.False (r.OnKeyDown (new Key { KeyCode = KeyCode.Null })); Assert.False (r.OnKeyUp (new Key { KeyCode = KeyCode.Null })); - Assert.False (r.MouseEvent (new MouseEvent { Flags = MouseFlags.AllEvents })); + Assert.False (r.OnMouseEvent (new MouseEvent { Flags = MouseFlags.AllEvents })); Assert.False (r.OnMouseEnter (new MouseEvent { Flags = MouseFlags.AllEvents })); Assert.False (r.OnMouseLeave (new MouseEvent { Flags = MouseFlags.AllEvents })); diff --git a/UnitTests/Text/AutocompleteTests.cs b/UnitTests/Text/AutocompleteTests.cs index f44f48ca9..61ad0d023 100644 --- a/UnitTests/Text/AutocompleteTests.cs +++ b/UnitTests/Text/AutocompleteTests.cs @@ -50,7 +50,7 @@ This a long line and against TextView. } Assert.True ( - tv.MouseEvent ( + tv.OnMouseEvent ( new MouseEvent { X = 6, Y = 0, Flags = MouseFlags.Button1Pressed } ) ); diff --git a/UnitTests/View/NavigationTests.cs b/UnitTests/View/NavigationTests.cs index ac93b2b15..bb4703495 100644 --- a/UnitTests/View/NavigationTests.cs +++ b/UnitTests/View/NavigationTests.cs @@ -445,7 +445,7 @@ public class NavigationTests view.NewKeyDownEvent (Key.Space); Assert.True (wasClicked); - view.MouseEvent (new MouseEvent { Flags = MouseFlags.Button1Clicked }); + view.OnMouseEvent (new MouseEvent { Flags = MouseFlags.Button1Clicked }); Assert.False (wasClicked); Assert.True (view.Enabled); Assert.True (view.CanFocus); @@ -454,7 +454,7 @@ public class NavigationTests view.Enabled = false; view.NewKeyDownEvent (Key.Space); Assert.False (wasClicked); - view.MouseEvent (new MouseEvent { Flags = MouseFlags.Button1Clicked }); + view.OnMouseEvent (new MouseEvent { Flags = MouseFlags.Button1Clicked }); Assert.False (wasClicked); Assert.False (view.Enabled); Assert.True (view.CanFocus); @@ -483,7 +483,7 @@ public class NavigationTests win.NewKeyDownEvent (Key.Enter); Assert.True (wasClicked); - button.MouseEvent (new MouseEvent { Flags = MouseFlags.Button1Clicked }); + button.OnMouseEvent (new MouseEvent { Flags = MouseFlags.Button1Clicked }); Assert.False (wasClicked); Assert.True (button.Enabled); Assert.True (button.CanFocus); @@ -495,7 +495,7 @@ public class NavigationTests win.Enabled = false; button.NewKeyDownEvent (Key.Enter); Assert.False (wasClicked); - button.MouseEvent (new MouseEvent { Flags = MouseFlags.Button1Clicked }); + button.OnMouseEvent (new MouseEvent { Flags = MouseFlags.Button1Clicked }); Assert.False (wasClicked); Assert.False (button.Enabled); Assert.True (button.CanFocus); diff --git a/UnitTests/View/ViewTests.cs b/UnitTests/View/ViewTests.cs index a5ef315b4..02967ec64 100644 --- a/UnitTests/View/ViewTests.cs +++ b/UnitTests/View/ViewTests.cs @@ -840,7 +840,7 @@ At 0,0 //Assert.False (r.OnKeyDown (new KeyEventArgs () { Key = Key.Unknown })); Assert.False (r.OnKeyUp (new Key { KeyCode = KeyCode.Null })); - Assert.False (r.MouseEvent (new MouseEvent { Flags = MouseFlags.AllEvents })); + Assert.False (r.OnMouseEvent (new MouseEvent { Flags = MouseFlags.AllEvents })); Assert.False (r.OnMouseEnter (new MouseEvent { Flags = MouseFlags.AllEvents })); Assert.False (r.OnMouseLeave (new MouseEvent { Flags = MouseFlags.AllEvents })); diff --git a/UnitTests/Views/CheckBoxTests.cs b/UnitTests/Views/CheckBoxTests.cs index b0fca5a7e..bb387b0b3 100644 --- a/UnitTests/Views/CheckBoxTests.cs +++ b/UnitTests/Views/CheckBoxTests.cs @@ -47,7 +47,7 @@ public class CheckBoxTests Assert.False (checkBox.Checked); Assert.True (checkBox.NewKeyDownEvent (Key.Space)); Assert.True (checkBox.Checked); - Assert.True (checkBox.MouseEvent (new MouseEvent { X = 0, Y = 0, Flags = MouseFlags.Button1Clicked })); + Assert.True (checkBox.OnMouseEvent (new MouseEvent { X = 0, Y = 0, Flags = MouseFlags.Button1Clicked })); Assert.False (checkBox.Checked); checkBox.AllowNullChecked = true; @@ -60,11 +60,11 @@ public class CheckBoxTests {CM.Glyphs.NullChecked} Check this out 你", _output ); - Assert.True (checkBox.MouseEvent (new MouseEvent { X = 0, Y = 0, Flags = MouseFlags.Button1Clicked })); + Assert.True (checkBox.OnMouseEvent (new MouseEvent { X = 0, Y = 0, Flags = MouseFlags.Button1Clicked })); Assert.True (checkBox.Checked); Assert.True (checkBox.NewKeyDownEvent (Key.Space)); Assert.False (checkBox.Checked); - Assert.True (checkBox.MouseEvent (new MouseEvent { X = 0, Y = 0, Flags = MouseFlags.Button1Clicked })); + Assert.True (checkBox.OnMouseEvent (new MouseEvent { X = 0, Y = 0, Flags = MouseFlags.Button1Clicked })); Assert.Null (checkBox.Checked); checkBox.AllowNullChecked = false; diff --git a/UnitTests/Views/ColorPickerTests.cs b/UnitTests/Views/ColorPickerTests.cs index 2c1a48f1a..083110a7b 100644 --- a/UnitTests/Views/ColorPickerTests.cs +++ b/UnitTests/Views/ColorPickerTests.cs @@ -51,9 +51,9 @@ public class ColorPickerTests Application.Top.Add (colorPicker); Application.Begin (Application.Top); - Assert.False (colorPicker.MouseEvent (new MouseEvent ())); + Assert.False (colorPicker.OnMouseEvent (new MouseEvent ())); - Assert.True (colorPicker.MouseEvent (new MouseEvent { Flags = MouseFlags.Button1Clicked, X = 4, Y = 1 })); + Assert.True (colorPicker.OnMouseEvent (new MouseEvent { Flags = MouseFlags.Button1Clicked, X = 4, Y = 1 })); Assert.Equal (ColorName.Blue, colorPicker.SelectedColor); } diff --git a/UnitTests/Views/ComboBoxTests.cs b/UnitTests/Views/ComboBoxTests.cs index cc582af01..1a38b80d4 100644 --- a/UnitTests/Views/ComboBoxTests.cs +++ b/UnitTests/Views/ComboBoxTests.cs @@ -143,7 +143,7 @@ public class ComboBoxTests Assert.Equal ("", cb.Text); Assert.True ( - cb.MouseEvent ( + cb.OnMouseEvent ( new MouseEvent { X = cb.Bounds.Right - 1, Y = 0, Flags = MouseFlags.Button1Pressed } ) ); @@ -199,7 +199,7 @@ public class ComboBoxTests Assert.Equal ("", cb.Text); Assert.True ( - cb.MouseEvent ( + cb.OnMouseEvent ( new MouseEvent { X = cb.Bounds.Right - 1, Y = 0, Flags = MouseFlags.Button1Pressed } ) ); @@ -235,7 +235,7 @@ public class ComboBoxTests Assert.Equal ("", cb.Text); Assert.True ( - cb.MouseEvent ( + cb.OnMouseEvent ( new MouseEvent { X = cb.Bounds.Right - 1, Y = 0, Flags = MouseFlags.Button1Pressed } ) ); @@ -291,7 +291,7 @@ public class ComboBoxTests Assert.Equal ("", cb.Text); Assert.True ( - cb.MouseEvent ( + cb.OnMouseEvent ( new MouseEvent { X = cb.Bounds.Right - 1, Y = 0, Flags = MouseFlags.Button1Pressed } ) ); @@ -302,7 +302,7 @@ public class ComboBoxTests Assert.True ( cb.Subviews [1] - .MouseEvent ( + .OnMouseEvent ( new MouseEvent { X = 0, Y = 1, Flags = MouseFlags.Button1Clicked } ) ); @@ -313,7 +313,7 @@ public class ComboBoxTests Assert.True ( cb.Subviews [1] - .MouseEvent ( + .OnMouseEvent ( new MouseEvent { X = 0, Y = 1, Flags = MouseFlags.Button1Clicked } ) ); @@ -326,7 +326,7 @@ public class ComboBoxTests Assert.True ( cb.Subviews [1] - .MouseEvent ( + .OnMouseEvent ( new MouseEvent { X = 0, Y = 2, Flags = MouseFlags.Button1Clicked } ) ); @@ -336,14 +336,14 @@ public class ComboBoxTests Assert.Equal ("Three", cb.Text); Assert.True ( - cb.MouseEvent ( + cb.OnMouseEvent ( new MouseEvent { X = cb.Bounds.Right - 1, Y = 0, Flags = MouseFlags.Button1Pressed } ) ); Assert.True ( cb.Subviews [1] - .MouseEvent ( + .OnMouseEvent ( new MouseEvent { X = 0, Y = 2, Flags = MouseFlags.Button1Clicked } ) ); @@ -353,7 +353,7 @@ public class ComboBoxTests Assert.Equal ("Three", cb.Text); Assert.True ( - cb.MouseEvent ( + cb.OnMouseEvent ( new MouseEvent { X = cb.Bounds.Right - 1, Y = 0, Flags = MouseFlags.Button1Pressed } ) ); @@ -364,7 +364,7 @@ public class ComboBoxTests Assert.True ( cb.Subviews [1] - .MouseEvent ( + .OnMouseEvent ( new MouseEvent { X = 0, Y = 0, Flags = MouseFlags.Button1Clicked } ) ); @@ -391,14 +391,14 @@ public class ComboBoxTests Assert.Equal ("", cb.Text); Assert.True ( - cb.MouseEvent ( + cb.OnMouseEvent ( new MouseEvent { X = cb.Bounds.Right - 1, Y = 0, Flags = MouseFlags.Button1Pressed } ) ); Assert.True ( cb.Subviews [1] - .MouseEvent ( + .OnMouseEvent ( new MouseEvent { X = cb.Bounds.Right - 1, Y = 0, Flags = MouseFlags.Button1Clicked } ) ); @@ -409,7 +409,7 @@ public class ComboBoxTests Assert.True ( cb.Subviews [1] - .MouseEvent ( + .OnMouseEvent ( new MouseEvent { X = -1, Y = 0, Flags = MouseFlags.Button1Clicked } ) ); @@ -422,7 +422,7 @@ public class ComboBoxTests Assert.True ( cb.Subviews [1] - .MouseEvent ( + .OnMouseEvent ( new MouseEvent { X = cb.Bounds.Right - 1, Y = 0, Flags = MouseFlags.Button1Clicked } ) ); @@ -433,7 +433,7 @@ public class ComboBoxTests Assert.True ( cb.Subviews [1] - .MouseEvent ( + .OnMouseEvent ( new MouseEvent { X = 0, Y = -1, Flags = MouseFlags.Button1Clicked } ) ); @@ -446,7 +446,7 @@ public class ComboBoxTests Assert.True ( cb.Subviews [1] - .MouseEvent ( + .OnMouseEvent ( new MouseEvent { X = cb.Bounds.Right - 1, Y = 0, Flags = MouseFlags.Button1Clicked } ) ); @@ -457,7 +457,7 @@ public class ComboBoxTests Assert.True ( cb.Subviews [1] - .MouseEvent ( + .OnMouseEvent ( new MouseEvent { X = cb.Frame.Width, Y = 0, Flags = MouseFlags.Button1Clicked } ) ); @@ -470,7 +470,7 @@ public class ComboBoxTests Assert.True ( cb.Subviews [1] - .MouseEvent ( + .OnMouseEvent ( new MouseEvent { X = cb.Bounds.Right - 1, Y = 0, Flags = MouseFlags.Button1Clicked } ) ); @@ -481,7 +481,7 @@ public class ComboBoxTests Assert.True ( cb.Subviews [1] - .MouseEvent ( + .OnMouseEvent ( new MouseEvent { X = 0, Y = cb.Frame.Height, Flags = MouseFlags.Button1Clicked } ) ); @@ -508,7 +508,7 @@ public class ComboBoxTests Assert.Equal ("", cb.Text); Assert.True ( - cb.MouseEvent ( + cb.OnMouseEvent ( new MouseEvent { X = cb.Bounds.Right - 1, Y = 0, Flags = MouseFlags.Button1Pressed } ) ); @@ -664,7 +664,7 @@ Three ", Assert.Equal ("", cb.Text); Assert.True ( - cb.MouseEvent ( + cb.OnMouseEvent ( new MouseEvent { X = cb.Bounds.Right - 1, Y = 0, Flags = MouseFlags.Button1Pressed } ) ); @@ -676,7 +676,7 @@ Three ", Assert.True (cb.Subviews [1].NewKeyDownEvent (Key.CursorDown)); Assert.True ( - cb.MouseEvent ( + cb.OnMouseEvent ( new MouseEvent { X = cb.Bounds.Right - 1, Y = 0, Flags = MouseFlags.Button1Pressed } ) ); @@ -686,7 +686,7 @@ Three ", Assert.Equal ("", cb.Text); Assert.True ( - cb.MouseEvent ( + cb.OnMouseEvent ( new MouseEvent { X = cb.Bounds.Right - 1, Y = 0, Flags = MouseFlags.Button1Pressed } ) ); @@ -698,7 +698,7 @@ Three ", Assert.True (cb.Subviews [1].NewKeyDownEvent (Key.CursorUp)); Assert.True ( - cb.MouseEvent ( + cb.OnMouseEvent ( new MouseEvent { X = cb.Bounds.Right - 1, Y = 0, Flags = MouseFlags.Button1Pressed } ) ); @@ -725,7 +725,7 @@ Three ", Assert.Equal ("", cb.Text); Assert.True ( - cb.MouseEvent ( + cb.OnMouseEvent ( new MouseEvent { X = cb.Bounds.Right - 1, Y = 0, Flags = MouseFlags.Button1Pressed } ) ); @@ -781,7 +781,7 @@ Three ", Assert.Equal ("", cb.Text); Assert.True ( - cb.MouseEvent ( + cb.OnMouseEvent ( new MouseEvent { X = cb.Bounds.Right - 1, Y = 0, Flags = MouseFlags.Button1Pressed } ) ); diff --git a/UnitTests/Views/ContextMenuTests.cs b/UnitTests/Views/ContextMenuTests.cs index 3337f2ba3..115b08534 100644 --- a/UnitTests/Views/ContextMenuTests.cs +++ b/UnitTests/Views/ContextMenuTests.cs @@ -106,11 +106,11 @@ public class ContextMenuTests Assert.True (ContextMenu.IsShow); Assert.Equal (cm.MenuBar, Application.MouseGrabView); Assert.False (menu.IsMenuOpen); - Assert.False (menu.MouseEvent (new MouseEvent { X = 1, Flags = MouseFlags.ReportMousePosition, View = menu })); + Assert.False (menu.OnMouseEvent (new MouseEvent { X = 1, Flags = MouseFlags.ReportMousePosition, View = menu })); Assert.True (ContextMenu.IsShow); Assert.Equal (cm.MenuBar, Application.MouseGrabView); Assert.False (menu.IsMenuOpen); - Assert.True (menu.MouseEvent (new MouseEvent { X = 1, Flags = MouseFlags.Button1Clicked, View = menu })); + Assert.True (menu.OnMouseEvent (new MouseEvent { X = 1, Flags = MouseFlags.Button1Clicked, View = menu })); Assert.False (ContextMenu.IsShow); Assert.Equal (menu, Application.MouseGrabView); Assert.True (menu.IsMenuOpen); @@ -642,7 +642,7 @@ public class ContextMenuTests Assert.True ( top.Subviews [0] - .MouseEvent ( + .OnMouseEvent ( new MouseEvent { X = 0, Y = 4, Flags = MouseFlags.ReportMousePosition, View = top.Subviews [0] } ) ); @@ -690,7 +690,7 @@ public class ContextMenuTests Assert.True ( top.Subviews [0] - .MouseEvent ( + .OnMouseEvent ( new MouseEvent { X = 30, Y = 4, Flags = MouseFlags.ReportMousePosition, View = top.Subviews [0] } ) ); @@ -737,7 +737,7 @@ public class ContextMenuTests Assert.True ( top.Subviews [0] - .MouseEvent ( + .OnMouseEvent ( new MouseEvent { X = 30, Y = 4, Flags = MouseFlags.ReportMousePosition, View = top.Subviews [0] } ) ); @@ -781,7 +781,7 @@ public class ContextMenuTests Assert.True ( top.Subviews [0] - .MouseEvent ( + .OnMouseEvent ( new MouseEvent { X = 30, Y = 4, Flags = MouseFlags.ReportMousePosition, View = top.Subviews [0] } ) ); @@ -825,7 +825,7 @@ public class ContextMenuTests Assert.True ( top.Subviews [0] - .MouseEvent ( + .OnMouseEvent ( new MouseEvent { X = 30, Y = 4, Flags = MouseFlags.ReportMousePosition, View = top.Subviews [0] } ) ); diff --git a/UnitTests/Views/ListViewTests.cs b/UnitTests/Views/ListViewTests.cs index df976a208..8acd233af 100644 --- a/UnitTests/Views/ListViewTests.cs +++ b/UnitTests/Views/ListViewTests.cs @@ -713,7 +713,7 @@ Item 6", //│Three│ //└─────┘", output); - // Assert.True (lv.MouseEvent (new MouseEvent { + // Assert.True (lv.OnMouseEvent (new MouseEvent { // X = 0, // Y = 0, // Flags = MouseFlags.Button1Clicked @@ -721,7 +721,7 @@ Item 6", // Assert.Equal ("", selected); // Assert.Equal (-1, lv.SelectedItem); - // Assert.True (lv.MouseEvent (new MouseEvent { + // Assert.True (lv.OnMouseEvent (new MouseEvent { // X = 0, // Y = 1, // Flags = MouseFlags.Button1Clicked @@ -729,7 +729,7 @@ Item 6", // Assert.Equal ("One", selected); // Assert.Equal (0, lv.SelectedItem); - // Assert.True (lv.MouseEvent (new MouseEvent { + // Assert.True (lv.OnMouseEvent (new MouseEvent { // X = 0, // Y = 2, // Flags = MouseFlags.Button1Clicked @@ -737,7 +737,7 @@ Item 6", // Assert.Equal ("Two", selected); // Assert.Equal (1, lv.SelectedItem); - // Assert.True (lv.MouseEvent (new MouseEvent { + // Assert.True (lv.OnMouseEvent (new MouseEvent { // X = 0, // Y = 3, // Flags = MouseFlags.Button1Clicked @@ -745,7 +745,7 @@ Item 6", // Assert.Equal ("Three", selected); // Assert.Equal (2, lv.SelectedItem); - // Assert.True (lv.MouseEvent (new MouseEvent { + // Assert.True (lv.OnMouseEvent (new MouseEvent { // X = 0, // Y = 4, // Flags = MouseFlags.Button1Clicked diff --git a/UnitTests/Views/MenuBarTests.cs b/UnitTests/Views/MenuBarTests.cs index aa014591a..38f6594cb 100644 --- a/UnitTests/Views/MenuBarTests.cs +++ b/UnitTests/Views/MenuBarTests.cs @@ -37,13 +37,13 @@ public class MenuBarTests Assert.True (mi.Checked); Assert.True ( - menu.MouseEvent ( + menu.OnMouseEvent ( new MouseEvent { X = 0, Y = 0, Flags = MouseFlags.Button1Pressed, View = menu } ) ); Assert.True ( - menu._openMenu.MouseEvent ( + menu._openMenu.OnMouseEvent ( new MouseEvent { X = 0, Y = 1, Flags = MouseFlags.Button1Clicked, View = menu._openMenu } ) ); @@ -57,7 +57,7 @@ public class MenuBarTests Assert.Null (mi.Checked); Assert.True ( - menu.MouseEvent ( + menu.OnMouseEvent ( new MouseEvent { X = 0, Y = 0, Flags = MouseFlags.Button1Pressed, View = menu } ) ); @@ -75,7 +75,7 @@ public class MenuBarTests ); Assert.True ( - menu._openMenu.MouseEvent ( + menu._openMenu.OnMouseEvent ( new MouseEvent { X = 0, Y = 1, Flags = MouseFlags.Button1Clicked, View = menu._openMenu } ) ); @@ -87,13 +87,13 @@ public class MenuBarTests Assert.False (mi.Checked); Assert.True ( - menu.MouseEvent ( + menu.OnMouseEvent ( new MouseEvent { X = 0, Y = 0, Flags = MouseFlags.Button1Pressed, View = menu } ) ); Assert.True ( - menu._openMenu.MouseEvent ( + menu._openMenu.OnMouseEvent ( new MouseEvent { X = 0, Y = 1, Flags = MouseFlags.Button1Clicked, View = menu._openMenu } ) ); @@ -296,7 +296,7 @@ public class MenuBarTests ); Assert.True ( - menu.MouseEvent ( + menu.OnMouseEvent ( new MouseEvent { X = 0, Y = 0, Flags = MouseFlags.Button1Pressed, View = menu } ) ); @@ -317,7 +317,7 @@ public class MenuBarTests Assert.True ( top.Subviews [1] - .MouseEvent ( + .OnMouseEvent ( new MouseEvent { X = 0, Y = 2, Flags = MouseFlags.Button1Clicked, View = top.Subviews [1] } ) ); @@ -338,7 +338,7 @@ public class MenuBarTests Assert.True ( top.Subviews [1] - .MouseEvent ( + .OnMouseEvent ( new MouseEvent { X = 0, Y = 2, Flags = MouseFlags.ReportMousePosition, View = top.Subviews [1] } ) ); @@ -1460,13 +1460,13 @@ wo Application.Top.Add (menu); Application.Begin (Application.Top); - Assert.True (menu.MouseEvent (new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1Pressed, View = menu })); + Assert.True (menu.OnMouseEvent (new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1Pressed, View = menu })); Assert.True (menu.IsMenuOpen); Application.Top.Draw (); TestHelpers.AssertDriverContentsAre (expectedMenu.ExpectedSubMenuOpen (0), _output); - Assert.True (menu.MouseEvent (new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1Pressed, View = menu })); + Assert.True (menu.OnMouseEvent (new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1Pressed, View = menu })); Assert.False (menu.IsMenuOpen); Application.Top.Draw (); TestHelpers.AssertDriverContentsAre (expectedMenu.ClosedMenuText, _output); @@ -2171,7 +2171,7 @@ wo // open the menu Assert.True ( - menu.MouseEvent ( + menu.OnMouseEvent ( new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1Pressed, View = menu } ) ); @@ -2180,7 +2180,7 @@ wo Assert.Equal ("_New", miCurrent.Title); Assert.True ( - mCurrent.MouseEvent ( + mCurrent.OnMouseEvent ( new MouseEvent { X = 1, Y = 1, Flags = MouseFlags.ReportMousePosition, View = mCurrent } ) ); @@ -2189,7 +2189,7 @@ wo Assert.Equal ("_New", miCurrent.Title); Assert.True ( - mCurrent.MouseEvent ( + mCurrent.OnMouseEvent ( new MouseEvent { X = 1, Y = 2, Flags = MouseFlags.ReportMousePosition, View = mCurrent } ) ); @@ -2198,7 +2198,7 @@ wo Assert.Equal ("_New", miCurrent.Title); Assert.True ( - mCurrent.MouseEvent ( + mCurrent.OnMouseEvent ( new MouseEvent { X = 1, Y = 3, Flags = MouseFlags.ReportMousePosition, View = mCurrent } ) ); @@ -2208,7 +2208,7 @@ wo // close the menu Assert.True ( - menu.MouseEvent ( + menu.OnMouseEvent ( new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1Pressed, View = menu } ) ); @@ -2373,7 +2373,7 @@ Edit Application.Begin (Application.Top); Assert.True ( - menu.MouseEvent ( + menu.OnMouseEvent ( new MouseEvent { X = 10, Y = 0, Flags = MouseFlags.Button1Pressed, View = menu } ) ); @@ -2382,7 +2382,7 @@ Edit Assert.Equal ("_Copy", miCurrent.Title); Assert.True ( - mCurrent.MouseEvent ( + mCurrent.OnMouseEvent ( new MouseEvent { X = 10, Y = 3, Flags = MouseFlags.ReportMousePosition, View = mCurrent } ) ); @@ -2395,7 +2395,7 @@ Edit if (i == -1) { Assert.False ( - mCurrent.MouseEvent ( + mCurrent.OnMouseEvent ( new MouseEvent { X = 10, Y = i, Flags = MouseFlags.ReportMousePosition, View = menu } ) ); @@ -2403,7 +2403,7 @@ Edit else { Assert.True ( - mCurrent.MouseEvent ( + mCurrent.OnMouseEvent ( new MouseEvent { X = 10, Y = i, Flags = MouseFlags.ReportMousePosition, View = mCurrent } ) ); @@ -2564,14 +2564,14 @@ Edit Application.Begin (Application.Top); Assert.True (tf.HasFocus); - Assert.True (menu.MouseEvent (new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1Pressed, View = menu })); + Assert.True (menu.OnMouseEvent (new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1Pressed, View = menu })); Assert.True (menu.IsMenuOpen); Assert.False (tf.HasFocus); Application.Top.Draw (); TestHelpers.AssertDriverContentsAre (expectedMenu.ExpectedSubMenuOpen (0), _output); Assert.True ( - menu.MouseEvent ( + menu.OnMouseEvent ( new MouseEvent { X = 8, Y = 0, Flags = MouseFlags.ReportMousePosition, View = menu } ) ); @@ -2581,7 +2581,7 @@ Edit TestHelpers.AssertDriverContentsAre (expectedMenu.ExpectedSubMenuOpen (1), _output); Assert.True ( - menu.MouseEvent ( + menu.OnMouseEvent ( new MouseEvent { X = 15, Y = 0, Flags = MouseFlags.ReportMousePosition, View = menu } ) ); @@ -2591,7 +2591,7 @@ Edit TestHelpers.AssertDriverContentsAre (expectedMenu.ExpectedSubMenuOpen (2), _output); Assert.True ( - menu.MouseEvent ( + menu.OnMouseEvent ( new MouseEvent { X = 8, Y = 0, Flags = MouseFlags.ReportMousePosition, View = menu } ) ); @@ -2601,7 +2601,7 @@ Edit TestHelpers.AssertDriverContentsAre (expectedMenu.ClosedMenuText, _output); Assert.True ( - menu.MouseEvent ( + menu.OnMouseEvent ( new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.ReportMousePosition, View = menu } ) ); @@ -2610,7 +2610,7 @@ Edit Application.Top.Draw (); TestHelpers.AssertDriverContentsAre (expectedMenu.ExpectedSubMenuOpen (0), _output); - Assert.True (menu.MouseEvent (new MouseEvent { X = 8, Y = 0, Flags = MouseFlags.Button1Pressed, View = menu })); + Assert.True (menu.OnMouseEvent (new MouseEvent { X = 8, Y = 0, Flags = MouseFlags.Button1Pressed, View = menu })); Assert.False (menu.IsMenuOpen); Assert.True (tf.HasFocus); Application.Top.Draw (); @@ -2939,7 +2939,7 @@ Edit Assert.Equal (new Rectangle (1, 0, 8, 1), pos); Assert.True ( - menu.MouseEvent ( + menu.OnMouseEvent ( new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1Pressed, View = menu } ) ); @@ -2958,7 +2958,7 @@ Edit Assert.Equal (new Rectangle (1, 0, 10, 6), pos); Assert.False ( - menu.MouseEvent ( + menu.OnMouseEvent ( new MouseEvent { X = 1, Y = 3, Flags = MouseFlags.ReportMousePosition, View = Application.Top.Subviews [1] @@ -2981,7 +2981,7 @@ Edit Assert.Equal (new Rectangle (1, 0, 25, 7), pos); Assert.False ( - menu.MouseEvent ( + menu.OnMouseEvent ( new MouseEvent { X = 1, Y = 2, Flags = MouseFlags.ReportMousePosition, View = Application.Top.Subviews [1] @@ -3003,7 +3003,7 @@ Edit Assert.Equal (new Rectangle (1, 0, 10, 6), pos); Assert.False ( - menu.MouseEvent ( + menu.OnMouseEvent ( new MouseEvent { X = 70, Y = 2, Flags = MouseFlags.Button1Clicked, View = Application.Top } ) ); @@ -3246,7 +3246,7 @@ Edit Assert.Equal (new Rectangle (1, 0, 8, 1), pos); Assert.True ( - menu.MouseEvent ( + menu.OnMouseEvent ( new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1Pressed, View = menu } ) ); @@ -3265,7 +3265,7 @@ Edit Assert.Equal (new Rectangle (1, 0, 10, 6), pos); Assert.False ( - menu.MouseEvent ( + menu.OnMouseEvent ( new MouseEvent { X = 1, Y = 3, Flags = MouseFlags.Button1Clicked, View = Application.Top.Subviews [1] } ) ); @@ -3285,7 +3285,7 @@ Edit Assert.Equal (new Rectangle (1, 0, 15, 7), pos); Assert.False ( - menu.MouseEvent ( + menu.OnMouseEvent ( new MouseEvent { X = 1, Y = 2, Flags = MouseFlags.Button1Clicked, View = Application.Top.Subviews [2] } ) ); @@ -3304,7 +3304,7 @@ Edit Assert.Equal (new Rectangle (1, 0, 10, 6), pos); Assert.False ( - menu.MouseEvent ( + menu.OnMouseEvent ( new MouseEvent { X = 70, Y = 2, Flags = MouseFlags.Button1Clicked, View = Application.Top } ) ); @@ -3440,7 +3440,7 @@ Edit Assert.Equal (new Rectangle (1, 0, 8, 1), pos); Assert.True ( - menu.MouseEvent ( + menu.OnMouseEvent ( new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1Pressed, View = menu } ) ); @@ -3457,7 +3457,7 @@ Edit Assert.Equal (new Rectangle (1, 0, 8, 4), pos); Assert.False ( - menu.MouseEvent ( + menu.OnMouseEvent ( new MouseEvent { X = 1, Y = 2, Flags = MouseFlags.Button1Clicked, View = Application.Top.Subviews [1] } ) ); @@ -3475,7 +3475,7 @@ Edit Assert.Equal (new Rectangle (1, 0, 13, 5), pos); Assert.False ( - menu.MouseEvent ( + menu.OnMouseEvent ( new MouseEvent { X = 1, Y = 1, Flags = MouseFlags.Button1Clicked, View = Application.Top.Subviews [2] } ) ); @@ -3492,7 +3492,7 @@ Edit Assert.Equal (new Rectangle (1, 0, 8, 4), pos); Assert.False ( - menu.MouseEvent ( + menu.OnMouseEvent ( new MouseEvent { X = 70, Y = 2, Flags = MouseFlags.Button1Clicked, View = Application.Top } ) ); diff --git a/UnitTests/Views/StatusBarTests.cs b/UnitTests/Views/StatusBarTests.cs index d72c78148..1deb7a0be 100644 --- a/UnitTests/Views/StatusBarTests.cs +++ b/UnitTests/Views/StatusBarTests.cs @@ -163,7 +163,7 @@ CTRL-O Open { { Assert.Equal ("Quiting...", msg); msg = ""; - sb.MouseEvent (new MouseEvent { X = 1, Y = 24, Flags = MouseFlags.Button1Clicked }); + sb.OnMouseEvent (new MouseEvent { X = 1, Y = 24, Flags = MouseFlags.Button1Clicked }); } else { diff --git a/UnitTests/Views/TableViewTests.cs b/UnitTests/Views/TableViewTests.cs index 5a7baf277..b90f42b11 100644 --- a/UnitTests/Views/TableViewTests.cs +++ b/UnitTests/Views/TableViewTests.cs @@ -2190,7 +2190,7 @@ public class TableViewTests tv.MultiSelect = true; // Clicking in bottom row - tv.MouseEvent ( + tv.OnMouseEvent ( new MouseEvent { X = 1, Y = 4, Flags = MouseFlags.Button1Clicked } ); @@ -2198,7 +2198,7 @@ public class TableViewTests Assert.Equal (2, tv.SelectedRow); // shift clicking top row - tv.MouseEvent ( + tv.OnMouseEvent ( new MouseEvent { X = 1, Y = 2, Flags = MouseFlags.Button1Clicked | MouseFlags.ButtonCtrl } ); @@ -2262,7 +2262,7 @@ public class TableViewTests tv.Style.AlwaysUseNormalColorForVerticalCellLines = true; // Clicking in bottom row - tv.MouseEvent ( + tv.OnMouseEvent ( new MouseEvent { X = 1, Y = 4, Flags = MouseFlags.Button1Clicked } ); @@ -2317,7 +2317,7 @@ public class TableViewTests tv.Style.ShowVerticalHeaderLines = false; // Clicking in bottom row - tv.MouseEvent ( + tv.OnMouseEvent ( new MouseEvent { X = 1, Y = 4, Flags = MouseFlags.Button1Clicked } ); @@ -2370,7 +2370,7 @@ A B C tv.Style.ShowHorizontalBottomline = true; // Clicking in bottom row - tv.MouseEvent ( + tv.OnMouseEvent ( new MouseEvent { X = 1, Y = 4, Flags = MouseFlags.Button1Clicked } ); @@ -2551,7 +2551,7 @@ A B C tv.MultiSelect = true; // Clicking in bottom row - tv.MouseEvent ( + tv.OnMouseEvent ( new MouseEvent { X = 1, Y = 3, Flags = MouseFlags.Button1Clicked } ); @@ -2559,7 +2559,7 @@ A B C Assert.Equal (1, tv.SelectedRow); // shift clicking top row - tv.MouseEvent ( + tv.OnMouseEvent ( new MouseEvent { X = 1, Y = 2, Flags = MouseFlags.Button1Clicked | MouseFlags.ButtonShift } ); diff --git a/UnitTests/Views/TextFieldTests.cs b/UnitTests/Views/TextFieldTests.cs index cd6cc88c6..413973ac0 100644 --- a/UnitTests/Views/TextFieldTests.cs +++ b/UnitTests/Views/TextFieldTests.cs @@ -121,7 +121,7 @@ public class TextFieldTests Assert.False (fv.CanFocus); Assert.False (fv.HasFocus); - tf.MouseEvent ( + tf.OnMouseEvent ( new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1DoubleClicked } ); @@ -135,7 +135,7 @@ public class TextFieldTests fv.CanFocus = true; tf.CanFocus = true; - tf.MouseEvent ( + tf.OnMouseEvent ( new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1DoubleClicked } ); @@ -147,7 +147,7 @@ public class TextFieldTests fv.CanFocus = false; - tf.MouseEvent ( + tf.OnMouseEvent ( new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1DoubleClicked } ); @@ -482,7 +482,7 @@ public class TextFieldTests tf.Text = "Les Misérables movie."; Assert.True ( - tf.MouseEvent ( + tf.OnMouseEvent ( new MouseEvent { X = 7, Y = 1, Flags = MouseFlags.Button1DoubleClicked, View = tf } ) ); @@ -1147,12 +1147,12 @@ public class TextFieldTests var ev = new MouseEvent { X = 0, Y = 0, Flags = MouseFlags.Button1DoubleClicked }; - tf.MouseEvent (ev); + tf.OnMouseEvent (ev); Assert.Equal (1, tf.SelectedLength); ev = new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1DoubleClicked }; - tf.MouseEvent (ev); + tf.OnMouseEvent (ev); Assert.Equal (1, tf.SelectedLength); } @@ -1532,14 +1532,14 @@ public class TextFieldTests Assert.Equal ("m", runes [idx].ToString ()); Assert.True ( - tf.MouseEvent ( + tf.OnMouseEvent ( new MouseEvent { X = idx, Y = 1, Flags = MouseFlags.Button1DoubleClicked, View = tf } ) ); Assert.Equal ("movie.", tf.SelectedText); Assert.True ( - tf.MouseEvent ( + tf.OnMouseEvent ( new MouseEvent { X = idx + 1, Y = 1, Flags = MouseFlags.Button1DoubleClicked, View = tf } ) ); diff --git a/UnitTests/Views/TextValidateFieldTests.cs b/UnitTests/Views/TextValidateFieldTests.cs index 162172ce5..981c83a27 100644 --- a/UnitTests/Views/TextValidateFieldTests.cs +++ b/UnitTests/Views/TextValidateFieldTests.cs @@ -322,7 +322,7 @@ public class TextValidateField_NET_Provider_Tests Assert.False (field.IsValid); Assert.Equal ("--(1 )--", field.Provider.Text); - field.MouseEvent (new MouseEvent { X = 25, Flags = MouseFlags.Button1Pressed }); + field.OnMouseEvent (new MouseEvent { X = 25, Flags = MouseFlags.Button1Pressed }); field.NewKeyDownEvent (Key.D1); diff --git a/UnitTests/Views/TextViewTests.cs b/UnitTests/Views/TextViewTests.cs index 68421509c..fdbe0e789 100644 --- a/UnitTests/Views/TextViewTests.cs +++ b/UnitTests/Views/TextViewTests.cs @@ -159,7 +159,7 @@ public class TextViewTests Assert.False (fv.CanFocus); Assert.False (fv.HasFocus); - tv.MouseEvent (new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1DoubleClicked }); + tv.OnMouseEvent (new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1DoubleClicked }); Assert.Empty (tv.SelectedText); Assert.False (tv.CanFocus); @@ -170,7 +170,7 @@ public class TextViewTests Assert.Throws (() => tv.CanFocus = true); fv.CanFocus = true; tv.CanFocus = true; - tv.MouseEvent (new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1DoubleClicked }); + tv.OnMouseEvent (new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1DoubleClicked }); Assert.Equal ("some ", tv.SelectedText); Assert.True (tv.CanFocus); @@ -179,7 +179,7 @@ public class TextViewTests Assert.True (fv.HasFocus); fv.CanFocus = false; - tv.MouseEvent (new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1DoubleClicked }); + tv.OnMouseEvent (new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1DoubleClicked }); Assert.Equal ("some ", tv.SelectedText); // Setting CanFocus to false don't change the SelectedText Assert.False (tv.CanFocus); @@ -1064,7 +1064,7 @@ This is the second line. for (var i = 0; i < 12; i++) { - tv.MouseEvent (new MouseEvent { Flags = MouseFlags.WheeledRight }); + tv.OnMouseEvent (new MouseEvent { Flags = MouseFlags.WheeledRight }); tv.PositionCursor (); Assert.Equal (Math.Min (i + 1, 11), tv.LeftColumn); Assert.Equal (CursorVisibility.Invisible, tv.DesiredCursorVisibility); @@ -1072,7 +1072,7 @@ This is the second line. for (var i = 11; i > 0; i--) { - tv.MouseEvent (new MouseEvent { Flags = MouseFlags.WheeledLeft }); + tv.OnMouseEvent (new MouseEvent { Flags = MouseFlags.WheeledLeft }); tv.PositionCursor (); Assert.Equal (i - 1, tv.LeftColumn); @@ -1107,7 +1107,7 @@ This is the second line. for (var i = 0; i < 12; i++) { - tv.MouseEvent (new MouseEvent { Flags = MouseFlags.WheeledDown }); + tv.OnMouseEvent (new MouseEvent { Flags = MouseFlags.WheeledDown }); tv.PositionCursor (); Assert.Equal (i + 1, tv.TopRow); Assert.Equal (CursorVisibility.Invisible, tv.DesiredCursorVisibility); @@ -1115,7 +1115,7 @@ This is the second line. for (var i = 12; i > 0; i--) { - tv.MouseEvent (new MouseEvent { Flags = MouseFlags.WheeledUp }); + tv.OnMouseEvent (new MouseEvent { Flags = MouseFlags.WheeledUp }); tv.PositionCursor (); Assert.Equal (i - 1, tv.TopRow); @@ -6780,7 +6780,7 @@ This is the second line. Assert.Equal ("TAB to jump between text fields.", _textView.Text); Assert.True ( - _textView.MouseEvent ( + _textView.OnMouseEvent ( new MouseEvent { X = 12, Y = 0, Flags = MouseFlags.Button1Pressed | MouseFlags.ButtonShift } ) ); @@ -6790,7 +6790,7 @@ This is the second line. Assert.True (_textView.Selecting); Assert.Equal ("TAB to jump ", _textView.SelectedText); - Assert.True (_textView.MouseEvent (new MouseEvent { X = 12, Y = 0, Flags = MouseFlags.Button1Clicked })); + Assert.True (_textView.OnMouseEvent (new MouseEvent { X = 12, Y = 0, Flags = MouseFlags.Button1Clicked })); Assert.Equal (0, _textView.SelectionStartRow); Assert.Equal (0, _textView.SelectionStartRow); Assert.Equal (new Point (12, 0), _textView.CursorPosition); @@ -6798,7 +6798,7 @@ This is the second line. Assert.Equal ("TAB to jump ", _textView.SelectedText); Assert.True ( - _textView.MouseEvent ( + _textView.OnMouseEvent ( new MouseEvent { X = 19, Y = 0, Flags = MouseFlags.Button1Pressed | MouseFlags.ButtonShift } ) ); @@ -6808,7 +6808,7 @@ This is the second line. Assert.True (_textView.Selecting); Assert.Equal ("TAB to jump between", _textView.SelectedText); - Assert.True (_textView.MouseEvent (new MouseEvent { X = 19, Y = 0, Flags = MouseFlags.Button1Clicked })); + Assert.True (_textView.OnMouseEvent (new MouseEvent { X = 19, Y = 0, Flags = MouseFlags.Button1Clicked })); Assert.Equal (0, _textView.SelectionStartRow); Assert.Equal (0, _textView.SelectionStartRow); Assert.Equal (new Point (19, 0), _textView.CursorPosition); @@ -6816,7 +6816,7 @@ This is the second line. Assert.Equal ("TAB to jump between", _textView.SelectedText); Assert.True ( - _textView.MouseEvent ( + _textView.OnMouseEvent ( new MouseEvent { X = 24, Y = 0, Flags = MouseFlags.Button1Pressed | MouseFlags.ButtonShift } ) ); @@ -6826,14 +6826,14 @@ This is the second line. Assert.True (_textView.Selecting); Assert.Equal ("TAB to jump between text", _textView.SelectedText); - Assert.True (_textView.MouseEvent (new MouseEvent { X = 24, Y = 0, Flags = MouseFlags.Button1Clicked })); + Assert.True (_textView.OnMouseEvent (new MouseEvent { X = 24, Y = 0, Flags = MouseFlags.Button1Clicked })); Assert.Equal (0, _textView.SelectionStartRow); Assert.Equal (0, _textView.SelectionStartRow); Assert.Equal (new Point (24, 0), _textView.CursorPosition); Assert.True (_textView.Selecting); Assert.Equal ("TAB to jump between text", _textView.SelectedText); - Assert.True (_textView.MouseEvent (new MouseEvent { X = 24, Y = 0, Flags = MouseFlags.Button1Pressed })); + Assert.True (_textView.OnMouseEvent (new MouseEvent { X = 24, Y = 0, Flags = MouseFlags.Button1Pressed })); Assert.Equal (0, _textView.SelectionStartRow); Assert.Equal (0, _textView.SelectionStartRow); Assert.Equal (new Point (24, 0), _textView.CursorPosition); @@ -7607,12 +7607,12 @@ TAB to jump between text field", var ev = new MouseEvent { X = 0, Y = 0, Flags = MouseFlags.Button1DoubleClicked }; - tv.MouseEvent (ev); + tv.OnMouseEvent (ev); Assert.Equal (1, tv.SelectedLength); ev = new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1DoubleClicked }; - tv.MouseEvent (ev); + tv.OnMouseEvent (ev); Assert.Equal (1, tv.SelectedLength); } @@ -7726,7 +7726,7 @@ line. _output ); - Assert.True (tv.MouseEvent (new MouseEvent { X = 0, Y = 3, Flags = MouseFlags.Button1Pressed })); + Assert.True (tv.OnMouseEvent (new MouseEvent { X = 0, Y = 3, Flags = MouseFlags.Button1Pressed })); tv.Draw (); Assert.Equal (new Point (0, 3), tv.CursorPosition); Assert.Equal (new Point (13, 0), cp); diff --git a/UnitTests/Views/ToplevelTests.cs b/UnitTests/Views/ToplevelTests.cs index d6c367677..cdcd2620a 100644 --- a/UnitTests/Views/ToplevelTests.cs +++ b/UnitTests/Views/ToplevelTests.cs @@ -384,12 +384,12 @@ public class ToplevelTests Assert.Equal (new Rectangle (0, 1, 60, 15), win.Frame); Assert.Null (Toplevel._dragPosition); - win.MouseEvent (new MouseEvent { X = 6, Y = 0, Flags = MouseFlags.Button1Pressed }); + win.OnMouseEvent (new MouseEvent { X = 6, Y = 0, Flags = MouseFlags.Button1Pressed }); Assert.Equal (new Point (6, 0), Toplevel._dragPosition); - win.MouseEvent (new MouseEvent { X = 6, Y = 0, Flags = MouseFlags.Button1Released }); + win.OnMouseEvent (new MouseEvent { X = 6, Y = 0, Flags = MouseFlags.Button1Released }); Assert.Null (Toplevel._dragPosition); win.CanFocus = false; - win.MouseEvent (new MouseEvent { X = 6, Y = 0, Flags = MouseFlags.Button1Pressed }); + win.OnMouseEvent (new MouseEvent { X = 6, Y = 0, Flags = MouseFlags.Button1Pressed }); Assert.Null (Toplevel._dragPosition); } diff --git a/UnitTests/Views/TreeViewTests.cs b/UnitTests/Views/TreeViewTests.cs index d170a7ec3..5b180870b 100644 --- a/UnitTests/Views/TreeViewTests.cs +++ b/UnitTests/Views/TreeViewTests.cs @@ -452,7 +452,7 @@ public class TreeViewTests Assert.False (called); // double click triggers activation - tree.MouseEvent (new MouseEvent { Y = 0, Flags = MouseFlags.Button1DoubleClicked }); + tree.OnMouseEvent (new MouseEvent { Y = 0, Flags = MouseFlags.Button1DoubleClicked }); Assert.True (called); Assert.Same (f, activated); @@ -484,12 +484,12 @@ public class TreeViewTests Assert.False (called); // double click does nothing because we changed button binding to right click - tree.MouseEvent (new MouseEvent { Y = 1, Flags = MouseFlags.Button1DoubleClicked }); + tree.OnMouseEvent (new MouseEvent { Y = 1, Flags = MouseFlags.Button1DoubleClicked }); Assert.Null (activated); Assert.False (called); - tree.MouseEvent (new MouseEvent { Y = 1, Flags = MouseFlags.Button2Clicked }); + tree.OnMouseEvent (new MouseEvent { Y = 1, Flags = MouseFlags.Button2Clicked }); Assert.True (called); Assert.Same (car1, activated); @@ -521,7 +521,7 @@ public class TreeViewTests Assert.False (called); // double click does nothing because we changed button to null - tree.MouseEvent (new MouseEvent { Y = 0, Flags = MouseFlags.Button1DoubleClicked }); + tree.OnMouseEvent (new MouseEvent { Y = 0, Flags = MouseFlags.Button1DoubleClicked }); Assert.False (called); Assert.Null (activated);