Update View Action events to EventHandler events

Terminal.Gui/Core/View.cs

@@ -129,42 +129,42 @@ namespace Terminal.Gui {
 		/// <summary>
 		/// Event fired when the view gets focus.
 		/// </summary>
-		public event Action<FocusEventArgs> Enter;
+		public event EventHandler<FocusEventArgs> Enter;
 
 		/// <summary>
 		/// Event fired when the view looses focus.
 		/// </summary>
-		public event Action<FocusEventArgs> Leave;
+		public event EventHandler<FocusEventArgs> Leave;
 
 		/// <summary>
 		/// Event fired when the view receives the mouse event for the first time.
 		/// </summary>
-		public event Action<MouseEventArgs> MouseEnter;
+		public event EventHandler<MouseEventArgs> MouseEnter;
 
 		/// <summary>
 		/// Event fired when the view receives a mouse event for the last time.
 		/// </summary>
-		public event Action<MouseEventArgs> MouseLeave;
+		public event EventHandler<MouseEventArgs> MouseLeave;
 
 		/// <summary>
 		/// Event fired when a mouse event is generated.
 		/// </summary>
-		public event Action<MouseEventArgs> MouseClick;
+		public event EventHandler<MouseEventArgs> MouseClick;
 
 		/// <summary>
 		/// Event fired when the <see cref="CanFocus"/> value is being changed.
 		/// </summary>
-		public event Action CanFocusChanged;
+		public event EventHandler CanFocusChanged;
 
 		/// <summary>
 		/// Event fired when the <see cref="Enabled"/> value is being changed.
 		/// </summary>
-		public event Action EnabledChanged;
+		public event EventHandler EnabledChanged;
 
 		/// <summary>
 		/// Event fired when the <see cref="Visible"/> value is being changed.
 		/// </summary>
-		public event Action VisibleChanged;
+		public event EventHandler VisibleChanged;
 
 		/// <summary>
 		/// Event invoked when the <see cref="HotKey"/> is changed.
@@ -1382,7 +1382,7 @@ namespace Terminal.Gui {
 		public override bool OnEnter (View view)
 		{
 			var args = new FocusEventArgs (view);
-			Enter?.Invoke (args);
+			Enter?.Invoke (this, args);
 			if (args.Handled)
 				return true;
 			if (base.OnEnter (view))
@@ -1395,7 +1395,7 @@ namespace Terminal.Gui {
 		public override bool OnLeave (View view)
 		{
 			var args = new FocusEventArgs (view);
-			Leave?.Invoke (args);
+			Leave?.Invoke (this, args);
 			if (args.Handled)
 				return true;
 			if (base.OnLeave (view))
@@ -2875,7 +2875,7 @@ namespace Terminal.Gui {
 			}
 
 			var args = new MouseEventArgs (mouseEvent);
-			MouseEnter?.Invoke (args);
+			MouseEnter?.Invoke (this, args);
 
 			return args.Handled || base.OnMouseEnter (mouseEvent);
 		}
@@ -2892,7 +2892,7 @@ namespace Terminal.Gui {
 			}
 
 			var args = new MouseEventArgs (mouseEvent);
-			MouseLeave?.Invoke (args);
+			MouseLeave?.Invoke (this, args);
 
 			return args.Handled || base.OnMouseLeave (mouseEvent);
 		}
@@ -2938,18 +2938,18 @@ namespace Terminal.Gui {
 				return true;
 			}
 
-			MouseClick?.Invoke (args);
+			MouseClick?.Invoke (this, args);
 			return args.Handled;
 		}
 
 		/// <inheritdoc/>
-		public override void OnCanFocusChanged () => CanFocusChanged?.Invoke ();
+		public override void OnCanFocusChanged () => CanFocusChanged?.Invoke (this, EventArgs.Empty);
 
 		/// <inheritdoc/>
-		public override void OnEnabledChanged () => EnabledChanged?.Invoke ();
+		public override void OnEnabledChanged () => EnabledChanged?.Invoke (this, EventArgs.Empty);
 
 		/// <inheritdoc/>
-		public override void OnVisibleChanged () => VisibleChanged?.Invoke ();
+		public override void OnVisibleChanged () => VisibleChanged?.Invoke (this, EventArgs.Empty);
 
 		/// <inheritdoc/>
 		protected override void Dispose (bool disposing)

Terminal.Gui/Views/ScrollBarView.cs

@@ -119,7 +119,7 @@ namespace Terminal.Gui {
 			ClearOnVisibleFalse = false;
 		}
 
-		private void Host_VisibleChanged ()
+		private void Host_VisibleChanged (object sender, EventArgs e)
 		{
 			if (!Host.Visible) {
 				Visible = Host.Visible;
@@ -132,7 +132,7 @@ namespace Terminal.Gui {
 			}
 		}
 
-		private void Host_EnabledChanged ()
+		private void Host_EnabledChanged (object sender, EventArgs e)
 		{
 			Enabled = Host.Enabled;
 			if (otherScrollBarView != null) {
@@ -149,7 +149,7 @@ namespace Terminal.Gui {
 		//	}
 		//}
 
-		void ContentBottomRightCorner_MouseClick (MouseEventArgs me)
+		void ContentBottomRightCorner_MouseClick (object sender, MouseEventArgs me)
 		{
 			if (me.MouseEvent.Flags == MouseFlags.WheeledDown || me.MouseEvent.Flags == MouseFlags.WheeledUp
 				|| me.MouseEvent.Flags == MouseFlags.WheeledRight || me.MouseEvent.Flags == MouseFlags.WheeledLeft) {

Terminal.Gui/Views/ScrollView.cs

@@ -237,14 +237,14 @@ namespace Terminal.Gui {
 			SetNeedsLayout ();
 		}
 
-		void View_MouseLeave (MouseEventArgs e)
+		void View_MouseLeave (object sender, MouseEventArgs e)
 		{
 			if (Application.MouseGrabView != null && Application.MouseGrabView != vertical && Application.MouseGrabView != horizontal) {
 				Application.UngrabMouse ();
 			}
 		}
 
-		void View_MouseEnter (MouseEventArgs e)
+		void View_MouseEnter (object sender, MouseEventArgs e)
 		{
 			Application.GrabMouse (this);
 		}

Terminal.Gui/Windows/Wizard.cs

@@ -227,7 +227,7 @@ namespace Terminal.Gui {
 					helpTextView.SetNeedsDisplay ();
 				};
 
-				scrollBar.VisibleChanged += () => {
+				scrollBar.VisibleChanged += (s,e) => {
 					if (scrollBar.Visible && helpTextView.RightOffset == 0) {
 						helpTextView.RightOffset = 1;
 					} else if (!scrollBar.Visible && helpTextView.RightOffset == 1) {
@@ -235,7 +235,7 @@ namespace Terminal.Gui {
 					}
 				};
 
-				scrollBar.OtherScrollBarView.VisibleChanged += () => {
+				scrollBar.OtherScrollBarView.VisibleChanged += (s,e) => {
 					if (scrollBar.OtherScrollBarView.Visible && helpTextView.BottomOffset == 0) {
 						helpTextView.BottomOffset = 1;
 					} else if (!scrollBar.OtherScrollBarView.Visible && helpTextView.BottomOffset == 1) {
@@ -590,7 +590,7 @@ namespace Terminal.Gui {
 		{
 			SizeStep (newStep);
 
-			newStep.EnabledChanged += UpdateButtonsAndTitle;
+			newStep.EnabledChanged += (s,e)=> UpdateButtonsAndTitle();
 			newStep.TitleChanged += (args) => UpdateButtonsAndTitle ();
 			steps.AddLast (newStep);
 			this.Add (newStep);

UICatalog/Scenarios/ASCIICustomButton.cs

@@ -106,7 +106,7 @@ namespace UICatalog.Scenarios {
 				Add (border, fill, title);
 			}
 
-			private void This_MouseClick (MouseEventArgs obj)
+			private void This_MouseClick (object sender, MouseEventArgs obj)
 			{
 				OnMouseEvent (obj.MouseEvent);
 			}
@@ -258,7 +258,7 @@ namespace UICatalog.Scenarios {
 				}
 			}
 
-			private void Button_MouseClick (MouseEventArgs obj)
+			private void Button_MouseClick (object sender, MouseEventArgs obj)
 			{
 				if (obj.MouseEvent.Flags == MouseFlags.WheeledDown) {
 					scrollView.ContentOffset = new Point (scrollView.ContentOffset.X,

UICatalog/Scenarios/CharacterMap.cs

@@ -280,7 +280,7 @@ namespace UICatalog.Scenarios {
 		}
 
 		ContextMenu _contextMenu = new ContextMenu ();
-		void Handle_MouseClick (MouseEventArgs args)
+		void Handle_MouseClick (object sender, MouseEventArgs args)
 		{
 			var me = args.MouseEvent;
 			if (me.Flags == MouseFlags.ReportMousePosition || (me.Flags != MouseFlags.Button1Clicked &&

UICatalog/Scenarios/ConfigurationEditor.cs

@@ -165,7 +165,7 @@ namespace UICatalog.Scenarios {
 
 				textView.Read ();
 
-				textView.Enter += (a) => {
+				textView.Enter += (s,e) => {
 					_lenStatusItem.Title = $"Len:{textView.Text.Length}";
 				};
 

UICatalog/Scenarios/ContextMenus.cs

@@ -65,7 +65,7 @@ namespace UICatalog.Scenarios {
 				}
 			};
 
-			Win.MouseClick += (e) => {
+			Win.MouseClick += (s, e) => {
 				if (e.MouseEvent.Flags == contextMenu.MouseFlags) {
 					ShowContextMenu (e.MouseEvent.X, e.MouseEvent.Y);
 					e.Handled = true;

UICatalog/Scenarios/DynamicMenuBar.cs

@@ -404,7 +404,7 @@ namespace UICatalog.Scenarios {
 					SetFrameDetails (menuBarItem);
 				};
 
-				_lstMenus.Enter += (_) => {
+				_lstMenus.Enter += (s, e) => {
 					var menuBarItem = DataContext.Menus.Count > 0 ? DataContext.Menus [_lstMenus.SelectedItem].MenuItem : null;
 					SetFrameDetails (menuBarItem);
 				};
@@ -423,7 +423,7 @@ namespace UICatalog.Scenarios {
 					SelectCurrentMenuBarItem ();
 				};
 
-				_lblMenuBar.Enter += (e) => {
+				_lblMenuBar.Enter += (s, e) => {
 					if (_menuBar?.Menus != null) {
 						_currentMenuBarItem = _menuBar.Menus [_currentSelectedMenuBar];
 						SetFrameDetails (_menuBar.Menus [_currentSelectedMenuBar]);

UICatalog/Scenarios/DynamicStatusBar.cs

@@ -240,7 +240,7 @@ namespace UICatalog.Scenarios {
 					}
 				};
 
-				_lstItems.Enter += (_) => {
+				_lstItems.Enter += (s, e) => {
 					var statusItem = DataContext.Items.Count > 0 ? DataContext.Items [_lstItems.SelectedItem].StatusItem : null;
 					SetFrameDetails (statusItem);
 				};

UICatalog/Scenarios/Editor.cs

@@ -144,7 +144,7 @@ namespace UICatalog.Scenarios {
 				_textView.SetNeedsDisplay ();
 			};
 
-			_scrollBar.VisibleChanged += () => {
+			_scrollBar.VisibleChanged += (s,e) => {
 				if (_scrollBar.Visible && _textView.RightOffset == 0) {
 					_textView.RightOffset = 1;
 				} else if (!_scrollBar.Visible && _textView.RightOffset == 1) {
@@ -152,7 +152,7 @@ namespace UICatalog.Scenarios {
 				}
 			};
 
-			_scrollBar.OtherScrollBarView.VisibleChanged += () => {
+			_scrollBar.OtherScrollBarView.VisibleChanged += (s,e) => {
 				if (_scrollBar.OtherScrollBarView.Visible && _textView.BottomOffset == 0) {
 					_textView.BottomOffset = 1;
 				} else if (!_scrollBar.OtherScrollBarView.Visible && _textView.BottomOffset == 1) {
@@ -787,7 +787,7 @@ namespace UICatalog.Scenarios {
 				Y = Pos.Top (label),
 				Width = 20
 			};
-			txtToFind.Enter += (_) => txtToFind.Text = _textToFind;
+			txtToFind.Enter += (s, e) => txtToFind.Text = _textToFind;
 			d.Add (txtToFind);
 
 			var btnFindNext = new Button ("Find _Next") {
@@ -879,7 +879,7 @@ namespace UICatalog.Scenarios {
 				Y = Pos.Top (label),
 				Width = 20
 			};
-			txtToFind.Enter += (_) => txtToFind.Text = _textToFind;
+			txtToFind.Enter += (s, e) => txtToFind.Text = _textToFind;
 			d.Add (txtToFind);
 
 			var btnFindNext = new Button ("Replace _Next") {

UICatalog/Scenarios/Notepad.cs

@@ -67,7 +67,7 @@ namespace UICatalog.Scenarios {
 			});
 			focusedTabView = tabView;
 			tabView.SelectedTabChanged += TabView_SelectedTabChanged;
-			tabView.Enter += (e) => focusedTabView = tabView;
+			tabView.Enter += (s, e) => focusedTabView = tabView;
 
 			Application.Top.Add (statusBar);
 
@@ -174,7 +174,7 @@ namespace UICatalog.Scenarios {
 
 			tv.TabClicked += TabView_TabClicked;
 			tv.SelectedTabChanged += TabView_SelectedTabChanged;
-			tv.Enter += (e) => focusedTabView = tv;
+			tv.Enter += (s, e) => focusedTabView = tv;
 			return tv;
 		}
 

UICatalog/Scenarios/TableEditor.cs

@@ -132,7 +132,7 @@ namespace UICatalog.Scenarios {
 			};
 
 			// if user clicks the mouse in TableView
-			tableView.MouseClick += e => {
+			tableView.MouseClick += (s,e) => {
 
 				tableView.ScreenToCell (e.MouseEvent.X, e.MouseEvent.Y, out DataColumn clickedCol);
 

UICatalog/Scenarios/TextAlignmentsAndDirection.cs

@@ -109,7 +109,7 @@ namespace UICatalog.Scenarios {
 				Text = txt
 			};
 
-			editText.MouseClick += (m) => {
+			editText.MouseClick += (s, m) => {
 				foreach (var v in txts) {
 					v.Text = editText.Text;
 				}

UICatalog/Scenarios/TreeViewFileSystem.cs

@@ -129,7 +129,7 @@ namespace UICatalog.Scenarios {
 			}
 		}
 
-		private void TreeViewFiles_MouseClick (View.MouseEventArgs obj)
+		private void TreeViewFiles_MouseClick (object sender, View.MouseEventArgs obj)
 		{
 			// if user right clicks
 			if (obj.MouseEvent.Flags.HasFlag (MouseFlags.Button3Clicked)) {

UICatalog/Scenarios/Wizards.cs

@@ -245,7 +245,7 @@ namespace UICatalog.Scenarios {
 						someText.SetNeedsDisplay ();
 					};
 
-					scrollBar.VisibleChanged += () => {
+					scrollBar.VisibleChanged += (s, e) => {
 						if (scrollBar.Visible && someText.RightOffset == 0) {
 							someText.RightOffset = 1;
 						} else if (!scrollBar.Visible && someText.RightOffset == 1) {

UICatalog/UICatalog.cs

@@ -369,7 +369,7 @@ namespace UICatalog {
 					ScenarioListView.SetFocus ();
 				}
 
-				StatusBar.VisibleChanged += () => {
+				StatusBar.VisibleChanged += (s, e) => {
 					UICatalogApp.ShowStatusBar = StatusBar.Visible;
 
 					var height = (StatusBar.Visible ? 1 : 0);// + (MenuBar.Visible ? 1 : 0);

UnitTests/Core/ViewTests.cs

@@ -2441,15 +2441,15 @@ This is a tes
 			var view1 = new View { CanFocus = true };
 			var subView1 = new View { CanFocus = true };
 			var subView1subView1 = new View { CanFocus = true };
-			view1.Leave += (e) => {
+			view1.Leave += (s,e) => {
 				view1Leave = true;
 			};
-			subView1.Leave += (e) => {
+			subView1.Leave += (s,e) => {
 				subView1.Remove (subView1subView1);
 				subView1Leave = true;
 			};
 			view1.Add (subView1);
-			subView1subView1.Leave += (e) => {
+			subView1subView1.Leave += (s,e) => {
 				// This is never invoked
 				subView1subView1Leave = true;
 			};

UnitTests/Menus/ContextMenuTests.cs

@@ -202,7 +202,7 @@ namespace Terminal.Gui.MenuTests {
 
 			var cm = new ContextMenu ();
 
-			lbl.MouseClick += (e) => {
+			lbl.MouseClick += (s, e) => {
 				if (e.MouseEvent.Flags == cm.MouseFlags) {
 					lbl.Text = "Replaced";
 					e.Handled = true;

UnitTests/TopLevels/ToplevelTests.cs

@@ -983,8 +983,8 @@ namespace Terminal.Gui.TopLevelTests {
 			var isEnter = false;
 			var isLeave = false;
 			var v = new View ();
-			v.Enter += (_) => isEnter = true;
-			v.Leave += (_) => isLeave = true;
+			v.Enter += (s, _) => isEnter = true;
+			v.Leave += (s, _) => isLeave = true;
 			var top = Application.Top;
 			top.Add (v);
 

UnitTests/Views/AllViewsTests.cs

@@ -152,10 +152,10 @@ namespace Terminal.Gui.ViewTests {
 				var viewEnter = 0;
 				var viewLeave = 0;
 
-				vType.Enter += _ => vTypeEnter++;
-				vType.Leave += _ => vTypeLeave++;
-				view.Enter += _ => viewEnter++;
-				view.Leave += _ => viewLeave++;
+				vType.Enter += (s,e) => vTypeEnter++;
+				vType.Leave += (s, e) => vTypeLeave++;
+				view.Enter += (s, e) => viewEnter++;
+				view.Leave += (s, e) => viewLeave++;
 
 				top.Add (vType, view);
 				Application.Begin (top);

UnitTests/Views/ScrollBarViewTests.cs

@@ -668,7 +668,7 @@ namespace Terminal.Gui.ViewTests {
 				textView.SetNeedsDisplay ();
 			};
 
-			scrollBar.VisibleChanged += () => {
+			scrollBar.VisibleChanged += (s,e) => {
 				if (scrollBar.Visible && textView.RightOffset == 0) {
 					textView.RightOffset = 1;
 				} else if (!scrollBar.Visible && textView.RightOffset == 1) {
@@ -676,7 +676,7 @@ namespace Terminal.Gui.ViewTests {
 				}
 			};
 
-			scrollBar.OtherScrollBarView.VisibleChanged += () => {
+			scrollBar.OtherScrollBarView.VisibleChanged += (s,e) => {
 				if (scrollBar.OtherScrollBarView.Visible && textView.BottomOffset == 0) {
 					textView.BottomOffset = 1;
 				} else if (!scrollBar.OtherScrollBarView.Visible && textView.BottomOffset == 1) {

UnitTests/Views/TextFieldTests.cs

@@ -1235,7 +1235,7 @@ namespace Terminal.Gui.ViewTests {
 
 			var tf = new TextField () { Width = 10 };
 			int clickCounter = 0;
-			tf.MouseClick += (m) => { clickCounter++; };
+			tf.MouseClick += (s, m) => { clickCounter++; };
 
 			Application.Top.Add (tf);
 			Application.Begin (Application.Top);