Selected->Selecting

Terminal.Gui/Views/Shortcut.cs

@@ -477,7 +477,7 @@ public class Shortcut : View, IOrientation, IDesignable
             }
 
             // Clean up old 
-            _commandView.Selecting -= CommandViewOnSelected;
+            _commandView.Selecting -= CommandViewOnSelecting;
             _commandView.Accepted -= CommandViewOnAccepted;
             Remove (_commandView);
             _commandView?.Dispose ();
@@ -503,7 +503,7 @@ public class Shortcut : View, IOrientation, IDesignable
 
             Title = _commandView.Text;
 
-            _commandView.Selecting += CommandViewOnSelected;
+            _commandView.Selecting += CommandViewOnSelecting;
 
             _commandView.Accepted += CommandViewOnAccepted;
 
@@ -521,7 +521,7 @@ public class Shortcut : View, IOrientation, IDesignable
                 e.Handled = true;
             }
 
-            void CommandViewOnSelected (object? sender, CommandEventArgs e)
+            void CommandViewOnSelecting (object? sender, CommandEventArgs e)
             {
                 if (e.Context.Data != this)
                 {

UnitTests/View/Mouse/MouseTests.cs

@@ -38,7 +38,7 @@ public class MouseTests (ITestOutputHelper output) : TestsAllViews
     [InlineData (false, false, 1)]
     [InlineData (true, false, 1)]
     [InlineData (true, true, 1)]
-    public void MouseClick_Raises_Selected (bool canFocus, bool setFocus, int expectedSelectedCount)
+    public void MouseClick_Raises_Selecting (bool canFocus, bool setFocus, int expectedSelectingCount)
     {
         var superView = new View { CanFocus = true, Height = 1, Width = 15 };
         var focusedView = new View { CanFocus = true, Width = 1, Height = 1 };
@@ -56,12 +56,12 @@ public class MouseTests (ITestOutputHelper output) : TestsAllViews
             testView.SetFocus ();
         }
 
-        int selectedCount = 0;
-        testView.Selecting += (sender, args) => selectedCount++;
+        int selectingCount = 0;
+        testView.Selecting += (sender, args) => selectingCount++;
 
         testView.NewMouseEvent (new () { Position = new (0, 0), Flags = MouseFlags.Button1Clicked });
         Assert.True (superView.HasFocus);
-        Assert.Equal (expectedSelectedCount, selectedCount);
+        Assert.Equal (expectedSelectingCount, selectingCount);
     }
 
 
@@ -267,7 +267,7 @@ public class MouseTests (ITestOutputHelper output) : TestsAllViews
     [InlineData (MouseFlags.Button2Clicked)]
     [InlineData (MouseFlags.Button3Clicked)]
     [InlineData (MouseFlags.Button4Clicked)]
-    public void WantContinuousButtonPressed_True_Button_Clicked_Raises_Selected (MouseFlags clicked)
+    public void WantContinuousButtonPressed_True_Button_Clicked_Raises_Selecting (MouseFlags clicked)
     {
         var me = new MouseEvent ();
 
@@ -278,13 +278,13 @@ public class MouseTests (ITestOutputHelper output) : TestsAllViews
             WantContinuousButtonPressed = true
         };
 
-        var selectedCount = 0;
+        var selectingCount = 0;
 
-        view.Selecting += (s, e) => selectedCount++;
+        view.Selecting += (s, e) => selectingCount++;
 
         me.Flags = clicked;
         view.NewMouseEvent (me);
-        Assert.Equal (1, selectedCount);
+        Assert.Equal (1, selectingCount);
 
         view.Dispose ();
     }

UnitTests/View/ViewCommandTests.cs

@@ -145,62 +145,62 @@ public class ViewCommandTests (ITestOutputHelper output)
 
         Assert.Equal (canFocus, view.InvokeCommand (Command.Select));
 
-        Assert.Equal (1, view.OnSelectedCount);
+        Assert.Equal (1, view.OnSelectingCount);
 
-        Assert.Equal (1, view.SelectedCount);
+        Assert.Equal (1, view.SelectingCount);
 
         Assert.Equal (canFocus, view.HasFocus);
     }
 
     [Fact]
-    public void Select_Command_Handle_OnSelect_NoEvent ()
+    public void Select_Command_Handle_OnSelecting_NoEvent ()
     {
         var view = new ViewEventTester ();
         Assert.False (view.HasFocus);
 
-        view.HandleOnSelected = true;
+        view.HandleOnSelecting = true;
         Assert.True (view.InvokeCommand (Command.Select));
 
-        Assert.Equal (1, view.OnSelectedCount);
+        Assert.Equal (1, view.OnSelectingCount);
 
-        Assert.Equal (0, view.SelectedCount);
+        Assert.Equal (0, view.SelectingCount);
     }
 
     [Fact]
-    public void Select_Handle_Event_OnSelected_Returns_True ()
+    public void Select_Handle_Event_OnSelecting_Returns_True ()
     {
         var view = new View ();
-        var SelectedInvoked = false;
+        var SelectingInvoked = false;
 
         view.Selecting += ViewOnSelect;
 
         bool? ret = view.InvokeCommand (Command.Select);
         Assert.True (ret);
-        Assert.True (SelectedInvoked);
+        Assert.True (SelectingInvoked);
 
         return;
 
         void ViewOnSelect (object sender, CommandEventArgs e)
         {
-            SelectedInvoked = true;
+            SelectingInvoked = true;
             e.Cancel = true;
         }
     }
 
     [Fact]
-    public void Select_Command_Invokes_Selected_Event ()
+    public void Select_Command_Invokes_Selecting_Event ()
     {
         var view = new View ();
-        var selected = false;
+        var selecting = false;
 
-        view.Selecting += ViewOnSelected;
+        view.Selecting += ViewOnSelecting;
 
         view.InvokeCommand (Command.Select);
-        Assert.True (selected);
+        Assert.True (selecting);
 
         return;
 
-        void ViewOnSelected (object sender, CommandEventArgs e) { selected = true; }
+        void ViewOnSelecting (object sender, CommandEventArgs e) { selecting = true; }
     }
 
     [Fact]
@@ -209,7 +209,7 @@ public class ViewCommandTests (ITestOutputHelper output)
         var view = new ViewEventTester ();
         view.NewMouseEvent (new () { Flags = MouseFlags.Button1Clicked, Position = Point.Empty, View = view });
 
-        Assert.Equal (1, view.OnSelectedCount);
+        Assert.Equal (1, view.OnSelectingCount);
     }
 
     #endregion OnSelect/Select tests
@@ -250,8 +250,8 @@ public class ViewCommandTests (ITestOutputHelper output)
 
             Selecting += (s, a) =>
                              {
-                                 a.Cancel = HandleSelected;
-                                 SelectedCount++;
+                                 a.Cancel = HandleSelecting;
+                                 SelectingCount++;
                              };
         }
 
@@ -284,19 +284,19 @@ public class ViewCommandTests (ITestOutputHelper output)
         public bool HandleHotKeyHandled { get; set; }
 
 
-        public int OnSelectedCount { get; set; }
-        public int SelectedCount { get; set; }
-        public bool HandleOnSelected { get; set; }
+        public int OnSelectingCount { get; set; }
+        public int SelectingCount { get; set; }
+        public bool HandleOnSelecting { get; set; }
 
         /// <inheritdoc />
         protected override bool OnSelecting (CommandEventArgs args)
         {
-            OnSelectedCount++;
+            OnSelectingCount++;
 
-            return HandleOnSelected;
+            return HandleOnSelecting;
         }
 
-        public bool HandleSelected { get; set; }
+        public bool HandleSelecting { get; set; }
 
     }
 }

UnitTests/Views/AllViewsTests.cs

@@ -97,7 +97,7 @@ public class AllViewsTests (ITestOutputHelper output) : TestsAllViews
 
     [Theory]
     [MemberData (nameof (AllViewTypes))]
-    public void AllViews_Command_Select_Raises_Selected (Type viewType)
+    public void AllViews_Command_Select_Raises_Selecting (Type viewType)
     {
         var view = (View)CreateInstanceIfNotGeneric (viewType);
 
@@ -113,8 +113,8 @@ public class AllViewsTests (ITestOutputHelper output) : TestsAllViews
             designable.EnableForDesign ();
         }
 
-        var selectedCount = 0;
-        view.Selecting += (s, e) => selectedCount++;
+        var selectingCount = 0;
+        view.Selecting += (s, e) => selectingCount++;
 
         var acceptedCount = 0;
         view.Accepted += (s, e) =>
@@ -125,7 +125,7 @@ public class AllViewsTests (ITestOutputHelper output) : TestsAllViews
 
         if (view.InvokeCommand(Command.Select) == true)
         {
-            Assert.Equal(1, selectedCount);
+            Assert.Equal(1, selectingCount);
             Assert.Equal (0, acceptedCount);
         }
     }
@@ -148,8 +148,8 @@ public class AllViewsTests (ITestOutputHelper output) : TestsAllViews
             designable.EnableForDesign ();
         }
 
-        var selectedCount = 0;
-        view.Selecting += (s, e) => selectedCount++;
+        var selectingCount = 0;
+        view.Selecting += (s, e) => selectingCount++;
 
         var acceptedCount = 0;
         view.Accepted += (s, e) =>
@@ -160,7 +160,7 @@ public class AllViewsTests (ITestOutputHelper output) : TestsAllViews
 
         if (view.InvokeCommand (Command.Accept) == true)
         {
-            Assert.Equal (0, selectedCount);
+            Assert.Equal (0, selectingCount);
             Assert.Equal (1, acceptedCount);
         }
     }
@@ -188,8 +188,8 @@ public class AllViewsTests (ITestOutputHelper output) : TestsAllViews
             view.HotKey = Key.T;
         }
 
-        var selectedCount = 0;
-        view.Selecting += (s, e) => selectedCount++;
+        var selectingCount = 0;
+        view.Selecting += (s, e) => selectingCount++;
 
         var acceptedCount = 0;
         view.Accepted += (s, e) =>
@@ -206,7 +206,7 @@ public class AllViewsTests (ITestOutputHelper output) : TestsAllViews
         if (view.InvokeCommand (Command.HotKey) == true)
         {
             Assert.Equal (1, hotkeyHandledCount);
-            Assert.Equal (0, selectedCount);
+            Assert.Equal (0, selectingCount);
             Assert.Equal (0, acceptedCount);
         }
     }

UnitTests/Views/ButtonTests.cs

@@ -608,9 +608,9 @@ public class ButtonTests (ITestOutputHelper output)
             WantContinuousButtonPressed = true
         };
 
-        var selectedCount = 0;
+        var selectingCount = 0;
 
-        button.Selecting += (s, e) => selectedCount++;
+        button.Selecting += (s, e) => selectingCount++;
         var acceptedCount = 0;
         button.Accepted += (s, e) =>
                            {
@@ -621,19 +621,19 @@ public class ButtonTests (ITestOutputHelper output)
         me = new MouseEvent ();
         me.Flags = pressed;
         button.NewMouseEvent (me);
-        Assert.Equal (0, selectedCount);
+        Assert.Equal (0, selectingCount);
         Assert.Equal (0, acceptedCount);
 
         me = new MouseEvent ();
         me.Flags = released;
         button.NewMouseEvent (me);
-        Assert.Equal (0, selectedCount);
+        Assert.Equal (0, selectingCount);
         Assert.Equal (0, acceptedCount);
 
         me = new MouseEvent ();
         me.Flags = clicked;
         button.NewMouseEvent (me);
-        Assert.Equal (1, selectedCount);
+        Assert.Equal (1, selectingCount);
         Assert.Equal (1, acceptedCount);
 
         button.Dispose ();
@@ -663,23 +663,23 @@ public class ButtonTests (ITestOutputHelper output)
                                e.Handled = true;
                            };
 
-        var selectedCount = 0;
+        var selectingCount = 0;
 
         button.Selecting += (s, e) =>
                            {
-                               selectedCount++;
+                               selectingCount++;
                                e.Cancel = true;
                            };
 
         me.Flags = pressed;
         button.NewMouseEvent (me);
         Assert.Equal (0, acceptedCount);
-        Assert.Equal (0, selectedCount);
+        Assert.Equal (0, selectingCount);
 
         me.Flags = released;
         button.NewMouseEvent (me);
         Assert.Equal (0, acceptedCount);
-        Assert.Equal (0, selectedCount);
+        Assert.Equal (0, selectingCount);
 
         button.Dispose ();
     }

UnitTests/Views/RadioGroupTests.cs

@@ -90,8 +90,8 @@ public class RadioGroupTests (ITestOutputHelper output)
         var selectedItemChangedCount = 0;
         rg.SelectedItemChanged += (s, e) => selectedItemChangedCount++;
 
-        var selectedCount = 0;
-        rg.Selecting += (s, e) => selectedCount++;
+        var selectingCount = 0;
+        rg.Selecting += (s, e) => selectingCount++;
 
         var acceptedCount = 0;
         rg.Accepted += (s, e) => acceptedCount++;
@@ -99,7 +99,7 @@ public class RadioGroupTests (ITestOutputHelper output)
         // By default the first item is selected
         Assert.Equal (0, rg.SelectedItem);
         Assert.Equal (0, selectedItemChangedCount);
-        Assert.Equal (0, selectedCount);
+        Assert.Equal (0, selectingCount);
         Assert.Equal (0, acceptedCount);
         Assert.Equal (Key.Empty, rg.HotKey);
 
@@ -109,21 +109,21 @@ public class RadioGroupTests (ITestOutputHelper output)
         Assert.Equal (0, rg.SelectedItem);
         Assert.Equal (0, rg.Cursor);
         Assert.Equal (0, selectedItemChangedCount);
-        Assert.Equal (0, selectedCount);
+        Assert.Equal (0, selectingCount);
         Assert.Equal (0, acceptedCount);
 
         Assert.True (Application.OnKeyDown (Key.CursorDown));
         Assert.Equal (0, rg.SelectedItem); // Cursor changed, but selection didnt
         Assert.Equal (1, rg.Cursor);
         Assert.Equal (0, selectedItemChangedCount);
-        Assert.Equal (0, selectedCount);
+        Assert.Equal (0, selectingCount);
         Assert.Equal (0, acceptedCount);
 
         Assert.False (Application.OnKeyDown (Key.CursorDown)); // Should not change selection (should focus next view if there was one, which there isn't)
         Assert.Equal (0, rg.SelectedItem);
         Assert.Equal (1, rg.Cursor);
         Assert.Equal (0, selectedItemChangedCount);
-        Assert.Equal (0, selectedCount);
+        Assert.Equal (0, selectingCount);
         Assert.Equal (0, acceptedCount);
 
         // Test Select (Space) when Cursor != SelectedItem - Should select cursor
@@ -131,7 +131,7 @@ public class RadioGroupTests (ITestOutputHelper output)
         Assert.Equal (1, rg.SelectedItem);
         Assert.Equal (1, rg.Cursor);
         Assert.Equal (1, selectedItemChangedCount);
-        Assert.Equal (1, selectedCount);
+        Assert.Equal (1, selectingCount);
         Assert.Equal (0, acceptedCount);
 
         // Test Select (Space) when Cursor == SelectedItem - Should cycle
@@ -139,7 +139,7 @@ public class RadioGroupTests (ITestOutputHelper output)
         Assert.Equal (0, rg.SelectedItem);
         Assert.Equal (0, rg.Cursor);
         Assert.Equal (2, selectedItemChangedCount);
-        Assert.Equal (2, selectedCount);
+        Assert.Equal (2, selectingCount);
         Assert.Equal (0, acceptedCount);
 
         Assert.True (Application.OnKeyDown (Key.Space));
@@ -166,7 +166,7 @@ public class RadioGroupTests (ITestOutputHelper output)
         Assert.Equal (1, rg.SelectedItem);
         Assert.Equal (1, rg.Cursor);
         Assert.Equal (7, selectedItemChangedCount);
-        Assert.Equal (7, selectedCount);
+        Assert.Equal (7, selectingCount);
         Assert.Equal (0, acceptedCount);
 
         // Test HotKey
@@ -178,7 +178,7 @@ public class RadioGroupTests (ITestOutputHelper output)
         Assert.Equal (0, rg.SelectedItem);
         Assert.Equal (0, rg.Cursor);
         Assert.Equal (8, selectedItemChangedCount);
-        Assert.Equal (8, selectedCount);
+        Assert.Equal (8, selectingCount);
         Assert.Equal (0, acceptedCount);
 
         //     Make Selected != Cursor
@@ -191,7 +191,7 @@ public class RadioGroupTests (ITestOutputHelper output)
         Assert.Equal (1, rg.SelectedItem);
         Assert.Equal (1, rg.Cursor);
         Assert.Equal (9, selectedItemChangedCount);
-        Assert.Equal (9, selectedCount);
+        Assert.Equal (9, selectingCount);
         Assert.Equal (0, acceptedCount);
 
         Application.ResetState (true);
@@ -625,8 +625,8 @@ public class RadioGroupTests (ITestOutputHelper output)
         var selectedItemChanged = 0;
         radioGroup.SelectedItemChanged += (s, e) => selectedItemChanged++;
 
-        var selectedCount = 0;
-        radioGroup.Selecting += (s, e) => selectedCount++;
+        var selectingCount = 0;
+        radioGroup.Selecting += (s, e) => selectingCount++;
 
         var acceptedCount = 0;
         radioGroup.Accepted += (s, e) => acceptedCount++;
@@ -637,28 +637,28 @@ public class RadioGroupTests (ITestOutputHelper output)
         Assert.True (radioGroup.HasFocus);
         Assert.Equal (0, radioGroup.SelectedItem);
         Assert.Equal (0, selectedItemChanged);
-        Assert.Equal (0, selectedCount);
+        Assert.Equal (0, selectingCount);
         Assert.Equal (0, acceptedCount);
 
         // Click on the first item, which is already selected
         Assert.True (radioGroup.NewMouseEvent (new () { Position = new (0, 0), Flags = MouseFlags.Button1Clicked }));
         Assert.Equal (0, radioGroup.SelectedItem);
         Assert.Equal (0, selectedItemChanged);
-        Assert.Equal (0, selectedCount);
+        Assert.Equal (0, selectingCount);
         Assert.Equal (0, acceptedCount);
 
         // Click on the second item
         Assert.True (radioGroup.NewMouseEvent (new () { Position = new (0, 1), Flags = MouseFlags.Button1Clicked }));
         Assert.Equal (1, radioGroup.SelectedItem);
         Assert.Equal (1, selectedItemChanged);
-        Assert.Equal (1, selectedCount);
+        Assert.Equal (1, selectingCount);
         Assert.Equal (0, acceptedCount);
 
         // Click on the first item
         Assert.True (radioGroup.NewMouseEvent (new () { Position = new (0, 0), Flags = MouseFlags.Button1Clicked }));
         Assert.Equal (0, radioGroup.SelectedItem);
         Assert.Equal (2, selectedItemChanged);
-        Assert.Equal (2, selectedCount);
+        Assert.Equal (2, selectingCount);
         Assert.Equal (0, acceptedCount);
     }
 
@@ -675,8 +675,8 @@ public class RadioGroupTests (ITestOutputHelper output)
         var selectedItemChanged = 0;
         radioGroup.SelectedItemChanged += (s, e) => selectedItemChanged++;
 
-        var selectedCount = 0;
-        radioGroup.Selecting += (s, e) => selectedCount++;
+        var selectingCount = 0;
+        radioGroup.Selecting += (s, e) => selectingCount++;
 
         var acceptedCount = 0;
         var handleAccepted = false;
@@ -694,7 +694,7 @@ public class RadioGroupTests (ITestOutputHelper output)
         Assert.True (radioGroup.HasFocus);
         Assert.Equal (0, radioGroup.SelectedItem);
         Assert.Equal (0, selectedItemChanged);
-        Assert.Equal (0, selectedCount);
+        Assert.Equal (0, selectingCount);
         Assert.Equal (0, acceptedCount);
 
         // NOTE: Drivers ALWAYS generate a Button1Clicked event before Button1DoubleClicked
@@ -704,21 +704,21 @@ public class RadioGroupTests (ITestOutputHelper output)
         Assert.True (radioGroup.NewMouseEvent (new () { Position = new (0, 0), Flags = MouseFlags.Button1DoubleClicked }));
         Assert.Equal (0, radioGroup.SelectedItem);
         Assert.Equal (0, selectedItemChanged);
-        Assert.Equal (0, selectedCount);
+        Assert.Equal (0, selectingCount);
         Assert.Equal (1, acceptedCount);
 
         Assert.True (radioGroup.NewMouseEvent (new () { Position = new (0, 1), Flags = MouseFlags.Button1Clicked }));
         Assert.True (radioGroup.NewMouseEvent (new () { Position = new (0, 1), Flags = MouseFlags.Button1Clicked }));
         Assert.Equal (1, radioGroup.SelectedItem);
         Assert.Equal (1, selectedItemChanged);
-        Assert.Equal (1, selectedCount);
+        Assert.Equal (1, selectingCount);
         Assert.Equal (1, acceptedCount);
 
         Assert.True (radioGroup.NewMouseEvent (new () { Position = new (0, 1), Flags = MouseFlags.Button1Clicked }));
         Assert.True (radioGroup.NewMouseEvent (new () { Position = new (0, 1), Flags = MouseFlags.Button1DoubleClicked }));
         Assert.Equal (1, radioGroup.SelectedItem);
         Assert.Equal (1, selectedItemChanged);
-        Assert.Equal (1, selectedCount);
+        Assert.Equal (1, selectingCount);
         Assert.Equal (2, acceptedCount);
 
         View superView = new () { Id = "superView", CanFocus = true };
@@ -728,7 +728,7 @@ public class RadioGroupTests (ITestOutputHelper output)
         Assert.True (radioGroup.NewMouseEvent (new () { Position = new (0, 0), Flags = MouseFlags.Button1Clicked }));
         Assert.Equal (0, radioGroup.SelectedItem);
         Assert.Equal (2, selectedItemChanged);
-        Assert.Equal (2, selectedCount);
+        Assert.Equal (2, selectingCount);
         Assert.Equal (2, acceptedCount);
 
         var superViewAcceptCount = 0;
@@ -747,7 +747,7 @@ public class RadioGroupTests (ITestOutputHelper output)
         Assert.True (radioGroup.NewMouseEvent (new () { Position = new (0, 0), Flags = MouseFlags.Button1DoubleClicked }));
         Assert.Equal (0, radioGroup.SelectedItem);
         Assert.Equal (2, selectedItemChanged);
-        Assert.Equal (2, selectedCount);
+        Assert.Equal (2, selectingCount);
         Assert.Equal (3, acceptedCount);
         Assert.Equal (0, superViewAcceptCount);
 
@@ -756,7 +756,7 @@ public class RadioGroupTests (ITestOutputHelper output)
         Assert.True (radioGroup.NewMouseEvent (new () { Position = new (0, 0), Flags = MouseFlags.Button1DoubleClicked }));
         Assert.Equal (0, radioGroup.SelectedItem);
         Assert.Equal (2, selectedItemChanged);
-        Assert.Equal (2, selectedCount);
+        Assert.Equal (2, selectingCount);
         Assert.Equal (4, acceptedCount);
         Assert.Equal (1, superViewAcceptCount); // Accept bubbles up to superview
 

UnitTests/Views/TextFieldTests.cs

@@ -537,15 +537,15 @@ public class TextFieldTests (ITestOutputHelper output)
     {
         TextField tf = new ();
 
-        int selectedCount = 0;
-        tf.Selecting += (sender, args) => selectedCount++;
+        int selectingCount = 0;
+        tf.Selecting += (sender, args) => selectingCount++;
 
         Application.Top = new Toplevel ();
         Application.Top.Add (tf);
         tf.SetFocus ();
         Application.OnKeyDown (Key.Enter);
 
-        Assert.Equal (0, selectedCount);
+        Assert.Equal (0, selectingCount);
 
         Application.Top.Dispose ();
         Application.ResetState (ignoreDisposed: true);