Accepted now takes CommandEventArgs

Terminal.Gui/View/View.Command.cs

@@ -61,13 +61,13 @@ public partial class View // Command APIs
     /// </returns>
     protected bool? RaiseAccepted ()
     {
-        HandledEventArgs args = new ();
+        CommandEventArgs args = new ();
 
         // Best practice is to invoke the virtual method first.
         // This allows derived classes to handle the event and potentially cancel it.
-        args.Handled = OnAccepted (args) || args.Handled;
+        args.Cancel = OnAccepted (args) || args.Cancel;
 
-        if (!args.Handled)
+        if (!args.Cancel)
         {
             // If the event is not canceled by the virtual method, raise the event to notify any external subscribers.
             Accepted?.Invoke (this, args);
@@ -76,7 +76,7 @@ public partial class View // Command APIs
         // Accept is a special case where if the event is not canceled, the event is
         //  - Invoked on any peer-View with IsDefault == true
         //  - bubbled up the SuperView hierarchy.
-        if (!args.Handled)
+        if (!args.Cancel)
         {
             // If there's an IsDefault peer view in Subviews, try it
             var isDefaultView = SuperView?.Subviews.FirstOrDefault (v => v is Button { IsDefault: true });
@@ -93,23 +93,22 @@ public partial class View // Command APIs
             return SuperView?.InvokeCommand (Command.Accept, ctx: new (Command.Accept, null, null, this)) == true;
         }
 
-        return Accepted is null ? null : args.Handled;
+        return Accepted is null ? null : args.Cancel;
     }
 
-    // TODO: Change this to CancelEventArgs
     /// <summary>
-    ///     Called when the View's state has been accepted by the user. Set <see cref="HandledEventArgs.Handled"/> to
+    ///     Called when the View's state has been accepted by the user. Set <see cref="CommandEventArgs.Cancel"/> to
     ///     <see langword="true"/> to stop processing.
     /// </summary>
     /// <param name="args"></param>
     /// <returns><see langword="true"/> to stop processing.</returns>
-    protected virtual bool OnAccepted (HandledEventArgs args) { return false; }
+    protected virtual bool OnAccepted (CommandEventArgs args) { return false; }
 
     /// <summary>
     ///     Cancelable event raised when the View's state has been accepted by the user. Set
     ///     <see cref="HandledEventArgs.Handled"/> to cancel the event.
     /// </summary>
-    public event EventHandler<HandledEventArgs>? Accepted;
+    public event EventHandler<CommandEventArgs>? Accepted;
 
     /// <summary>
     ///     Called when the user has performed an action (e.g. <see cref="Command.Select"/>) causing the View to change state. Calls <see cref="OnSelecting"/> which can be cancelled; if not cancelled raises <see cref="Accepted"/>.

Terminal.Gui/Views/ComboBox.cs

@@ -39,7 +39,7 @@ public class ComboBox : View, IDesignable
         _listview.Accepted += (sender, args) =>
                               {
                                   // This prevents Accepted from bubbling up to the combobox
-                                  args.Handled = true;
+                                  args.Cancel = true;
 
                                   // But OpenSelectedItem won't be fired because of that. So do it here.
                                   SelectText ();

Terminal.Gui/Views/Menuv2.cs

@@ -78,12 +78,12 @@ public class Menuv2 : Bar
 
             shortcut.Accepted += ShortcutOnAccept;
 
-            void ShortcutOnAccept (object sender, HandledEventArgs e)
+            void ShortcutOnAccept (object sender, CommandEventArgs e)
             {
                 if (Arrangement.HasFlag (ViewArrangement.Overlapped) && Visible)
                 {
                     Visible = false;
-                    e.Handled = true;
+                    e.Cancel = true;
 
                     return;
                 }

Terminal.Gui/Views/NumericUpDown.cs

@@ -133,16 +133,16 @@ public class NumericUpDown<T> : View where T : notnull
 
         return;
 
-        void OnDownButtonOnAccept (object? s, HandledEventArgs e)
+        void OnDownButtonOnAccept (object? s, CommandEventArgs e)
         {
             InvokeCommand (Command.ScrollDown);
-            e.Handled = true;
+            e.Cancel = true;
         }
 
-        void OnUpButtonOnAccept (object? s, HandledEventArgs e)
+        void OnUpButtonOnAccept (object? s, CommandEventArgs e)
         {
             InvokeCommand (Command.ScrollUp);
-            e.Handled = true;
+            e.Cancel = true;
         }
     }
 

Terminal.Gui/Views/Shortcut.cs

@@ -515,10 +515,10 @@ public class Shortcut : View, IOrientation, IDesignable
 
             return;
 
-            void CommandViewOnAccepted (object? sender, HandledEventArgs e)
+            void CommandViewOnAccepted (object? sender, CommandEventArgs e)
             {
                 // Always eat CommandView.Accept
-                e.Handled = true;
+                e.Cancel = true;
             }
 
             void CommandViewOnSelecting (object? sender, CommandEventArgs e)

Terminal.Gui/Views/StatusBar.cs

@@ -120,7 +120,7 @@ public class StatusBar : Bar, IDesignable
                            {
                                button1.Visible = !button1.Visible;
                                button1.Enabled = button1.Visible;
-                               e.Handled = false;
+                               e.Cancel = false;
                            };
 
         Add (new Label

UICatalog/Scenarios/Bars.cs

@@ -170,7 +170,7 @@ public class Bars : Scenario
 
         popOverMenu.Accepted += PopOverMenuOnAccept;
 
-        void PopOverMenuOnAccept (object o, HandledEventArgs handledEventArgs)
+        void PopOverMenuOnAccept (object o, CommandEventArgs args)
         {
             if (popOverMenu.Visible)
             {
@@ -529,7 +529,7 @@ public class Bars : Scenario
                                                     {
                                                         button1.Visible = !button1.Visible;
                                                         button1.Enabled = button1.Visible;
-                                                        e.Handled = false;
+                                                        e.Cancel = false;
                                                     };
 
         bar.Add (new Label

UICatalog/Scenarios/Buttons.cs

@@ -49,16 +49,16 @@ public class Buttons : Scenario
 
         swapButton.Accepted += (s, e) =>
                              {
-                                 e.Handled = !swapButton.IsDefault;
+                                 e.Cancel = !swapButton.IsDefault;
                                  defaultButton.IsDefault = !defaultButton.IsDefault;
                                  swapButton.IsDefault = !swapButton.IsDefault;
                              };
 
         defaultButton.Accepted += (s, e) =>
                                 {
-                                    e.Handled = !defaultButton.IsDefault;
+                                    e.Cancel = !defaultButton.IsDefault;
 
-                                    if (e.Handled)
+                                    if (e.Cancel)
                                     {
                                         MessageBox.ErrorQuery ("Error", "This button is no longer the Quit button; the Swap Default button is.", "_Ok");
                                     }
@@ -71,7 +71,7 @@ public class Buttons : Scenario
                              {
                                  string btnText = button.Text;
                                  MessageBox.Query ("Message", $"Did you click {txt}?", "Yes", "No");
-                                 e.Handled = true;
+                                 e.Cancel = true;
                              };
         }
 
@@ -114,7 +114,7 @@ public class Buttons : Scenario
         button.Accepted += (s, e) =>
                          {
                              MessageBox.Query ("Message", "Question?", "Yes", "No");
-                             e.Handled = true;
+                             e.Cancel = true;
                          };
 
         var textChanger = new Button { X = 2, Y = Pos.Bottom (button) + 1, Text = "Te_xt Changer" };
@@ -122,7 +122,7 @@ public class Buttons : Scenario
         textChanger.Accepted += (s, e) =>
                               {
                                   textChanger.Text += "!";
-                                  e.Handled = true;
+                                  e.Cancel = true;
                               };
 
         main.Add (
@@ -133,7 +133,7 @@ public class Buttons : Scenario
                       Text = "Lets see if this will move as \"Text Changer\" grows"
                   }
                  );
-        button.Accepted += (sender, args) => { args.Handled = true; };
+        button.Accepted += (sender, args) => { args.Cancel = true; };
 
         var removeButton = new Button
         {
@@ -146,7 +146,7 @@ public class Buttons : Scenario
         removeButton.Accepted += (s, e) =>
                                {
                                    removeButton.Visible = false;
-                                   e.Handled = true;
+                                   e.Cancel = true;
                                };
 
         var computedFrame = new FrameView
@@ -172,7 +172,7 @@ public class Buttons : Scenario
         moveBtn.Accepted += (s, e) =>
                           {
                               moveBtn.X = moveBtn.Frame.X + 5;
-                              e.Handled = true;
+                              e.Cancel = true;
                           };
         computedFrame.Add (moveBtn);
 
@@ -189,7 +189,7 @@ public class Buttons : Scenario
         sizeBtn.Accepted += (s, e) =>
                           {
                               sizeBtn.Width = sizeBtn.Frame.Width + 5;
-                              e.Handled = true;
+                              e.Cancel = true;
                           };
         computedFrame.Add (sizeBtn);
 
@@ -214,7 +214,7 @@ public class Buttons : Scenario
                                                      moveBtnA.Frame.Width,
                                                      moveBtnA.Frame.Height
                                                     );
-                               e.Handled = true;
+                               e.Cancel = true;
                            };
         absoluteFrame.Add (moveBtnA);
 
@@ -232,13 +232,13 @@ public class Buttons : Scenario
                                                      sizeBtnA.Frame.Width + 5,
                                                      sizeBtnA.Frame.Height
                                                     );
-                               e.Handled = true;
+                               e.Cancel = true;
                            };
         absoluteFrame.Add (sizeBtnA);
 
         var label = new Label
         {
-            X = 2, Y = Pos.Bottom (computedFrame) + 1, 
+            X = 2, Y = Pos.Bottom (computedFrame) + 1,
             Text = "Text Ali_gnment (changes the four buttons above): "
         };
         main.Add (label);
@@ -251,7 +251,7 @@ public class Buttons : Scenario
             RadioLabels = new [] { "_Start", "_End", "_Center", "_Fill" },
             Title = "_9 RadioGroup",
             BorderStyle = LineStyle.Dotted,
-           // CanFocus = false
+            // CanFocus = false
         };
         main.Add (radioGroup);
 
@@ -300,7 +300,7 @@ public class Buttons : Scenario
         moveHotKeyBtn.Accepted += (s, e) =>
                                 {
                                     moveHotKeyBtn.Text = MoveHotkey (moveHotKeyBtn.Text);
-                                    e.Handled = true;
+                                    e.Cancel = true;
                                 };
         main.Add (moveHotKeyBtn);
 
@@ -317,7 +317,7 @@ public class Buttons : Scenario
         moveUnicodeHotKeyBtn.Accepted += (s, e) =>
                                        {
                                            moveUnicodeHotKeyBtn.Text = MoveHotkey (moveUnicodeHotKeyBtn.Text);
-                                           e.Handled = true;
+                                           e.Cancel = true;
                                        };
         main.Add (moveUnicodeHotKeyBtn);
 
@@ -401,7 +401,7 @@ public class Buttons : Scenario
         noRepeatButton.Accepted += (s, e) =>
                                  {
                                      noRepeatButton.Title = $"Accept Cou_nt: {++noRepeatAcceptCount}";
-                                     e.Handled = true;
+                                     e.Cancel = true;
                                  };
         main.Add (label, noRepeatButton);
 
@@ -423,7 +423,7 @@ public class Buttons : Scenario
         repeatButton.Accepted += (s, e) =>
                                {
                                    repeatButton.Title = $"Accept Co_unt: {++acceptCount}";
-                                   e.Handled = true;
+                                   e.Cancel = true;
                                };
 
         var enableCB = new CheckBox

UICatalog/Scenarios/CharacterMap.cs

@@ -173,7 +173,7 @@ public class CharacterMap : Scenario
 
         return;
 
-        void JumpEditOnAccept (object sender, HandledEventArgs e)
+        void JumpEditOnAccept (object sender, CommandEventArgs e)
         {
             if (jumpEdit.Text.Length == 0)
             {
@@ -245,7 +245,7 @@ public class CharacterMap : Scenario
 
 
             // Cancel the event to prevent ENTER from being handled elsewhere
-            e.Handled = true;
+            e.Cancel = true;
         }
     }
 
@@ -477,7 +477,7 @@ internal class CharMap : View
             ShadowStyle = ShadowStyle.None,
             CanFocus = false
         };
-        up.Accepted += (sender, args) => { args.Handled = ScrollVertical (-1) == true; };
+        up.Accepted += (sender, args) => { args.Cancel = ScrollVertical (-1) == true; };
 
         var down = new Button
         {

UICatalog/Scenarios/Dialogs.cs

@@ -198,7 +198,7 @@ public class Dialogs : Scenario
                                                                      );
                                        Application.Run (dlg);
                                        dlg.Dispose ();
-                                       e.Handled = true;
+                                       e.Cancel = true;
                                    };
 
         app.Add (showDialogButton);

UICatalog/Scenarios/FileDialogExamples.cs

@@ -137,7 +137,7 @@ public class FileDialogExamples : Scenario
                             }
                             finally
                             {
-                                e.Handled = true;
+                                e.Cancel = true;
                             }
                         };
         win.Add (btn);

UICatalog/Scenarios/GraphViewExample.cs

@@ -196,7 +196,7 @@ public class GraphViewExample : Scenario
         Application.Shutdown ();
     }
 
-    private void DiagShortcut_Accept (object sender, HandledEventArgs e)
+    private void DiagShortcut_Accept (object sender, CommandEventArgs e)
     {
         ToggleDiagnostics ();
 

UICatalog/Scenarios/LineDrawing.cs

@@ -150,7 +150,7 @@ public class LineDrawing : Scenario
         btnOk.Accepted += (s, e) =>
                         {
                             accept = true;
-                            e.Handled = true;
+                            e.Cancel = true;
                             Application.RequestStop ();
                         };
 
@@ -164,7 +164,7 @@ public class LineDrawing : Scenario
 
         btnCancel.Accepted += (s, e) =>
                             {
-                                e.Handled = true;
+                                e.Cancel = true;
                                 Application.RequestStop ();
                             };
 

UICatalog/Scenarios/MessageBoxes.cs

@@ -276,7 +276,7 @@ public class MessageBoxes : Scenario
                                                buttonPressedLabel.Text = "Invalid Options";
                                            }
 
-                                           e.Handled = true;
+                                           e.Cancel = true;
                                        };
         app.Add (showMessageBoxButton);
 

UICatalog/Scenarios/Shortcuts.cs

@@ -365,7 +365,7 @@ public class Shortcuts : Scenario
                     {
                         return;
                     }
-                    eventSource.Add ($"{shortcut!.Id}.Select: {shortcut!.CommandView.Text} {shortcut!.CommandView.GetType ().Name}");
+                    eventSource.Add ($"{shortcut!.Id}.Selecting: {shortcut!.CommandView.Text} {shortcut!.CommandView.GetType ().Name}");
                     eventLog.MoveDown ();
                 };
 
@@ -375,22 +375,22 @@ public class Shortcuts : Scenario
                     {
                         return;
                     }
-                    eventSource.Add ($"{shortcut!.Id}.CommandView.Select: {shortcut!.CommandView.Text} {shortcut!.CommandView.GetType ().Name}");
+                    eventSource.Add ($"{shortcut!.Id}.CommandView.Selecting: {shortcut!.CommandView.Text} {shortcut!.CommandView.GetType ().Name}");
                     eventLog.MoveDown ();
                     args.Cancel = true;
                 };
 
                 shortcut.Accepted += (o, args) =>
                 {
-                    eventSource.Add ($"{shortcut!.Id}.Accept: {shortcut!.CommandView.Text} {shortcut!.CommandView.GetType ().Name}");
+                    eventSource.Add ($"{shortcut!.Id}.Accepting: {shortcut!.CommandView.Text} {shortcut!.CommandView.GetType ().Name}");
                     eventLog.MoveDown ();
                     // We don't want this to exit the Scenario
-                    args.Handled = true;
+                    args.Cancel = true;
                 };
 
                 shortcut.CommandView.Accepted += (o, args) =>
                 {
-                    eventSource.Add ($"{shortcut!.Id}.CommandView.Accept: {shortcut!.CommandView.Text} {shortcut!.CommandView.GetType ().Name}");
+                    eventSource.Add ($"{shortcut!.Id}.CommandView.Accepting: {shortcut!.CommandView.Text} {shortcut!.CommandView.GetType ().Name}");
                     eventLog.MoveDown ();
                 };
             }
@@ -399,9 +399,9 @@ public class Shortcuts : Scenario
         //((CheckBox)vShortcut5.CommandView).OnToggle ();
     }
 
-    private void Button_Clicked (object sender, HandledEventArgs e)
+    private void Button_Clicked (object sender, CommandEventArgs e)
     {
-        e.Handled = true;
+        e.Cancel = true;
         View view = sender as View;
         MessageBox.Query ("Hi", $"You clicked {view!.Text}", "_Ok");
     }

UICatalog/Scenarios/Sliders.cs

@@ -599,7 +599,7 @@ public class Sliders : Scenario
                              {
                                  eventSource.Add ($"Accept: {string.Join(",", slider.GetSetOptions ())}");
                                  eventLog.MoveDown ();
-                                 args.Handled = true;
+                                 args.Cancel = true;
                              };
             slider.OptionsChanged += (o, args) =>
                              {

UICatalog/Scenarios/Text.cs

@@ -450,9 +450,9 @@ public class Text : Scenario
 
         return;
 
-        void WinOnAccept (object sender, HandledEventArgs e)
+        void WinOnAccept (object sender, CommandEventArgs e)
         {
-            e.Handled = true; // Don't let it close
+            e.Cancel = true; // Don't let it close
 
             acceptView.Text = $"Accept was Invoked via {win.Focused.GetType().Name}";
 

UICatalog/UICatalog.cs

@@ -518,7 +518,7 @@ public class UICatalogApp
                 statusBarShortcut.Accepted += (sender, args) =>
                                             {
                                                 StatusBar.Visible = !StatusBar.Visible;
-                                                args.Handled = true;
+                                                args.Cancel = true;
                                             };
 
                 ShForce16Colors = new ()

UnitTests/View/ViewCommandTests.cs

@@ -50,10 +50,10 @@ public class ViewCommandTests (ITestOutputHelper output)
 
         return;
 
-        void ViewOnAccept (object sender, HandledEventArgs e)
+        void ViewOnAccept (object sender, CommandEventArgs e)
         {
             acceptInvoked = true;
-            e.Handled = true;
+            e.Cancel = true;
         }
     }
 
@@ -70,7 +70,7 @@ public class ViewCommandTests (ITestOutputHelper output)
 
         return;
 
-        void ViewOnAccept (object sender, HandledEventArgs e) { accepted = true; }
+        void ViewOnAccept (object sender, CommandEventArgs e) { accepted = true; }
     }
 
     // Accept on subview should bubble up to parent
@@ -237,7 +237,7 @@ public class ViewCommandTests (ITestOutputHelper output)
 
             Accepted += (s, a) =>
                       {
-                          a.Handled = HandleAccepted;
+                          a.Cancel = HandleAccepted;
                           AcceptedCount++;
                       };
 
@@ -260,7 +260,7 @@ public class ViewCommandTests (ITestOutputHelper output)
         public bool HandleOnAccepted { get; set; }
 
         /// <inheritdoc />
-        protected override bool OnAccepted (HandledEventArgs args)
+        protected override bool OnAccepted (CommandEventArgs args)
         {
             OnAcceptedCount++;
 

UnitTests/Views/ButtonTests.cs

@@ -491,7 +491,7 @@ public class ButtonTests (ITestOutputHelper output)
 
         return;
 
-        void ButtonOnAccept (object sender, HandledEventArgs e) { accepted = true; }
+        void ButtonOnAccept (object sender, CommandEventArgs e) { accepted = true; }
     }
 
     [Fact]
@@ -510,10 +510,10 @@ public class ButtonTests (ITestOutputHelper output)
 
         return;
 
-        void ButtonAccept (object sender, HandledEventArgs e)
+        void ButtonAccept (object sender, CommandEventArgs e)
         {
             acceptInvoked = true;
-            e.Handled = true;
+            e.Cancel = true;
         }
     }
 
@@ -615,7 +615,7 @@ public class ButtonTests (ITestOutputHelper output)
         button.Accepted += (s, e) =>
                            {
                                acceptedCount++;
-                               e.Handled = true;
+                               e.Cancel = true;
                            };
 
         me = new MouseEvent ();
@@ -660,7 +660,7 @@ public class ButtonTests (ITestOutputHelper output)
         button.Accepted += (s, e) =>
                            {
                                acceptedCount++;
-                               e.Handled = true;
+                               e.Cancel = true;
                            };
 
         var selectingCount = 0;

UnitTests/Views/CheckBoxTests.cs

@@ -236,10 +236,10 @@ public class CheckBoxTests (ITestOutputHelper output)
 
         return;
 
-        void ViewOnAccept (object sender, HandledEventArgs e)
+        void ViewOnAccept (object sender, CommandEventArgs e)
         {
             acceptInvoked = true;
-            e.Handled = true;
+            e.Cancel = true;
         }
     }
 
@@ -551,7 +551,7 @@ public class CheckBoxTests (ITestOutputHelper output)
 
         return;
 
-        void CheckBoxOnAccept (object sender, HandledEventArgs e) { accepted = true; }
+        void CheckBoxOnAccept (object sender, CommandEventArgs e) { accepted = true; }
     }
 
 

UnitTests/Views/LabelTests.cs

@@ -81,7 +81,7 @@ public class LabelTests (ITestOutputHelper output)
 
         return;
 
-        void LabelOnAccept (object sender, HandledEventArgs e) { accepted = true; }
+        void LabelOnAccept (object sender, CommandEventArgs e) { accepted = true; }
     }
 
     [Fact]

UnitTests/Views/ListViewTests.cs

@@ -421,7 +421,7 @@ Item 6",
 
         return;
 
-        void OnAccepted (object sender, HandledEventArgs e) { accepted = true; }
+        void OnAccepted (object sender, CommandEventArgs e) { accepted = true; }
     }
 
     [Fact]
@@ -452,7 +452,7 @@ Item 6",
             selectedValue = e.Value.ToString ();
         }
 
-        void Accepted (object sender, HandledEventArgs e) { accepted = true; }
+        void Accepted (object sender, CommandEventArgs e) { accepted = true; }
     }
 
     [Fact]
@@ -483,10 +483,10 @@ Item 6",
             selectedValue = e.Value.ToString ();
         }
 
-        void Accepted (object sender, HandledEventArgs e)
+        void Accepted (object sender, CommandEventArgs e)
         {
             accepted = true;
-            e.Handled = true;
+            e.Cancel = true;
         }
     }
 

UnitTests/Views/RadioGroupTests.cs

@@ -498,7 +498,7 @@ public class RadioGroupTests (ITestOutputHelper output)
 
         return;
 
-        void OnAccept (object sender, HandledEventArgs e) { accepted = true; }
+        void OnAccept (object sender, CommandEventArgs e) { accepted = true; }
     }
 
     [Fact]
@@ -514,7 +514,7 @@ public class RadioGroupTests (ITestOutputHelper output)
 
         return;
 
-        void OnAccept (object sender, HandledEventArgs e) { accepted = true; }
+        void OnAccept (object sender, CommandEventArgs e) { accepted = true; }
     }
 
     [Fact]
@@ -684,7 +684,7 @@ public class RadioGroupTests (ITestOutputHelper output)
         radioGroup.Accepted += (s, e) =>
                              {
                                  acceptedCount++;
-                                 e.Handled = handleAccepted;
+                                 e.Cancel = handleAccepted;
                              };
 
         Assert.True (radioGroup.DoubleClickAccepts);
@@ -736,7 +736,7 @@ public class RadioGroupTests (ITestOutputHelper output)
         superView.Accepted += (s, a) =>
                             {
                                 superViewAcceptCount++;
-                                a.Handled = true;
+                                a.Cancel = true;
                             };
 
         Assert.Equal (0, superViewAcceptCount);

UnitTests/Views/ShortcutTests.cs

@@ -613,7 +613,7 @@ public class ShortcutTests
         shortcut.Accepted += (s, e) =>
                              {
                                  accepted++;
-                                 e.Handled = true;
+                                 e.Cancel = true;
                              };
 
         Application.OnMouseEvent (
@@ -713,7 +713,7 @@ public class ShortcutTests
         shortcut.Accepted += (s, e) =>
                              {
                                  accepted++;
-                                 e.Handled = true;
+                                 e.Cancel = true;
                              };
 
         var selected = 0;

UnitTests/Views/TextFieldTests.cs

@@ -1,5 +1,4 @@
-using System.ComponentModel;
-using System.Globalization;
+using System.Globalization;
 using System.Reflection;
 using System.Text;
 using Xunit.Abstractions;
@@ -189,7 +188,6 @@ public class TextFieldTests (ITestOutputHelper output)
         tf.Draw ();
         TestHelpers.AssertDriverContentsAre ("Misérables", output);
         Application.Top.Dispose ();
-
     }
 
     [Theory]
@@ -523,13 +521,13 @@ public class TextFieldTests (ITestOutputHelper output)
 
         tf.Selecting += (sender, args) => Assert.Fail ("Selected should not be raied.");
 
-        Application.Top = new Toplevel ();
+        Application.Top = new ();
         Application.Top.Add (tf);
         tf.SetFocus ();
         Application.OnKeyDown (Key.Space);
 
         Application.Top.Dispose ();
-        Application.ResetState (ignoreDisposed: true);
+        Application.ResetState (true);
     }
 
     [Fact]
@@ -537,10 +535,10 @@ public class TextFieldTests (ITestOutputHelper output)
     {
         TextField tf = new ();
 
-        int selectingCount = 0;
+        var selectingCount = 0;
         tf.Selecting += (sender, args) => selectingCount++;
 
-        Application.Top = new Toplevel ();
+        Application.Top = new ();
         Application.Top.Add (tf);
         tf.SetFocus ();
         Application.OnKeyDown (Key.Enter);
@@ -548,7 +546,7 @@ public class TextFieldTests (ITestOutputHelper output)
         Assert.Equal (0, selectingCount);
 
         Application.Top.Dispose ();
-        Application.ResetState (ignoreDisposed: true);
+        Application.ResetState (true);
     }
 
     [Fact]
@@ -556,10 +554,10 @@ public class TextFieldTests (ITestOutputHelper output)
     {
         TextField tf = new ();
 
-        int acceptedCount = 0;
+        var acceptedCount = 0;
         tf.Accepted += (sender, args) => acceptedCount++;
 
-        Application.Top = new Toplevel ();
+        Application.Top = new ();
         Application.Top.Add (tf);
         tf.SetFocus ();
         Application.OnKeyDown (Key.Enter);
@@ -567,7 +565,7 @@ public class TextFieldTests (ITestOutputHelper output)
         Assert.Equal (1, acceptedCount);
 
         Application.Top.Dispose ();
-        Application.ResetState (ignoreDisposed: true);
+        Application.ResetState (true);
     }
 
     [Fact]
@@ -827,7 +825,7 @@ public class TextFieldTests (ITestOutputHelper output)
 
         return;
 
-        void OnAccept (object sender, HandledEventArgs e) { accepted = true; }
+        void OnAccept (object sender, CommandEventArgs e) { accepted = true; }
     }
 
     [Fact]
@@ -842,7 +840,7 @@ public class TextFieldTests (ITestOutputHelper output)
 
         return;
 
-        void Accept (object sender, HandledEventArgs e) { accepted = true; }
+        void Accept (object sender, CommandEventArgs e) { accepted = true; }
     }
 
     [Theory]
@@ -850,19 +848,20 @@ public class TextFieldTests (ITestOutputHelper output)
     [InlineData (true, 0)]
     public void Accepted_Handler_Handled_Prevents_Default_Button_Accept (bool handleAccept, int expectedButtonAccepts)
     {
-        var superView = new Window ()
+        var superView = new Window
         {
             Id = "superView"
         };
 
-        var tf = new TextField ()
+        var tf = new TextField
         {
             Id = "tf"
         };
-        var button = new Button ()
+
+        var button = new Button
         {
             Id = "button",
-            IsDefault = true,
+            IsDefault = true
         };
 
         superView.Add (tf, button);
@@ -887,34 +886,32 @@ public class TextFieldTests (ITestOutputHelper output)
 
         return;
 
-        void TextFieldAccept (object sender, HandledEventArgs e)
+        void TextFieldAccept (object sender, CommandEventArgs e)
         {
             textFieldAccept++;
-            e.Handled = handleAccept;
+            e.Cancel = handleAccept;
         }
 
-        void ButtonAccept (object sender, HandledEventArgs e)
-        {
-            buttonAccept++;
-        }
+        void ButtonAccept (object sender, CommandEventArgs e) { buttonAccept++; }
     }
 
     [Fact]
     public void Accepted_No_Handler_Enables_Default_Button_Accept ()
     {
-        var superView = new Window ()
+        var superView = new Window
         {
             Id = "superView"
         };
 
-        var tf = new TextField ()
+        var tf = new TextField
         {
             Id = "tf"
         };
-        var button = new Button ()
+
+        var button = new Button
         {
-            Id="button",
-            IsDefault = true,
+            Id = "button",
+            IsDefault = true
         };
 
         superView.Add (tf, button);
@@ -934,10 +931,7 @@ public class TextFieldTests (ITestOutputHelper output)
 
         return;
 
-        void ButtonAccept (object sender, HandledEventArgs e)
-        {
-            buttonAccept++;
-        }
+        void ButtonAccept (object sender, CommandEventArgs e) { buttonAccept++; }
     }
 
     [Fact]
@@ -964,10 +958,10 @@ public class TextFieldTests (ITestOutputHelper output)
 
         return;
 
-        void TextViewAccept (object sender, HandledEventArgs e)
+        void TextViewAccept (object sender, CommandEventArgs e)
         {
             tfAcceptedInvoked = true;
-            e.Handled = handle;
+            e.Cancel = handle;
         }
     }
 
@@ -1263,13 +1257,12 @@ public class TextFieldTests (ITestOutputHelper output)
     [TextFieldTestsAutoInitShutdown]
     public void TextChanged_Event ()
     {
-        bool eventFired = false;
+        var eventFired = false;
         _textField.TextChanged += (s, e) => eventFired = true;
 
         _textField.Text = "changed";
         Assert.True (eventFired);
         Assert.Equal ("changed", _textField.Text);
-
     }
 
     [Fact]
@@ -1977,7 +1970,7 @@ public class TextFieldTests (ITestOutputHelper output)
     public void Words_With_Accents_Incorrect_Order_Will_Result_With_Wrong_Accent_Place ()
     {
         var tf = new TextField { Width = 30, Text = "Les Misérables" };
-        tf.SetRelativeLayout (new Size (100, 100));
+        tf.SetRelativeLayout (new (100, 100));
         tf.Draw ();
 
         TestHelpers.AssertDriverContentsWithFrameAre (
@@ -2059,7 +2052,7 @@ Les Miśerables",
     {
         View superView = new ()
         {
-            CanFocus = true,
+            CanFocus = true
         };
 
         TextField t = new ();
@@ -2073,14 +2066,13 @@ Les Miśerables",
         Assert.Equal (2, superView.Subviews.Count);
     }
 
-
     [Fact]
     public void Autocomplete__Added_To_SuperView_On_Add ()
     {
         View superView = new ()
         {
             CanFocus = true,
-            Id = "superView",
+            Id = "superView"
         };
 
         superView.BeginInit ();
@@ -2097,13 +2089,12 @@ Les Miśerables",
         Assert.Equal (2, superView.Subviews.Count);
     }
 
-
     [Fact]
     public void Autocomplete_Visible_False_By_Default ()
     {
         View superView = new ()
         {
-            CanFocus = true,
+            CanFocus = true
         };
 
         TextField t = new ();

UnitTests/Views/TextViewTests.cs

@@ -8471,7 +8471,7 @@ line.
 
         return;
 
-        void OnAccept (object sender, HandledEventArgs e) { accepted = true; }
+        void OnAccept (object sender, CommandEventArgs e) { accepted = true; }
     }
 
     [Theory]
@@ -8491,7 +8491,7 @@ line.
 
         return;
 
-        void Accept (object sender, HandledEventArgs e) { acceptedEvents++; }
+        void Accept (object sender, CommandEventArgs e) { acceptedEvents++; }
     }
 
     [Theory]
@@ -8511,7 +8511,7 @@ line.
 
         return;
 
-        void Accept (object sender, HandledEventArgs e) { accepted++; }
+        void Accept (object sender, CommandEventArgs e) { accepted++; }
     }
 
     [Theory]
@@ -8531,7 +8531,7 @@ line.
 
         return;
 
-        void Accept (object sender, HandledEventArgs e) { accepted++; }
+        void Accept (object sender, CommandEventArgs e) { accepted++; }
     }
 
     [Theory]
@@ -8573,13 +8573,13 @@ line.
 
         return;
 
-        void TextViewAccept (object sender, HandledEventArgs e)
+        void TextViewAccept (object sender, CommandEventArgs e)
         {
             textViewAccept++;
-            e.Handled = handleAccept;
+            e.Cancel = handleAccept;
         }
 
-        void ButtonAccept (object sender, HandledEventArgs e)
+        void ButtonAccept (object sender, CommandEventArgs e)
         {
             buttonAccept++;
         }
@@ -8617,7 +8617,7 @@ line.
 
         return;
 
-        void ButtonAccept (object sender, HandledEventArgs e)
+        void ButtonAccept (object sender, CommandEventArgs e)
         {
             buttonAccept++;
         }

UnitTests/Views/TreeViewTests.cs

@@ -1350,7 +1350,7 @@ oot two
         Assert.False (accepted);
 
         return;
-        void OnAccept (object sender, HandledEventArgs e) { accepted = true; }
+        void OnAccept (object sender, CommandEventArgs e) { accepted = true; }
     }
 
 
@@ -1381,7 +1381,7 @@ oot two
             activated = true;
             selectedObject = e.ActivatedObject;
         }
-        void Accept (object sender, HandledEventArgs e) { accepted = true; }
+        void Accept (object sender, CommandEventArgs e) { accepted = true; }
     }
 
     [Fact]
@@ -1410,10 +1410,10 @@ oot two
             selectedObject = e.ActivatedObject;
         }
 
-        void Accept (object sender, HandledEventArgs e)
+        void Accept (object sender, CommandEventArgs e)
         {
             accepted = true;
-            e.Handled = true;
+            e.Cancel = true;
         }
     }
 }