Fixes #4050 - Select->Activate

Examples/UICatalog/Scenarios/EditorsAndHelpers/DimEditor.cs

@@ -93,7 +93,7 @@ private void DimEditor_Initialized (object? sender, EventArgs e)
         };
         Add (label);
         _dimRadioGroup = new () { X = 0, Y = Pos.Bottom (label), RadioLabels = _radioItems };
-        _dimRadioGroup.SelectedItemChanged += OnRadioGroupOnSelectedItemChanged;
+        _dimRadioGroup.SelectedItemChanged += OnRadioGroupOnSelectedtemChanged;
         _valueEdit = new ()
         {
             X = Pos.Right (label) + 1,
@@ -121,7 +121,7 @@ private void DimEditor_Initialized (object? sender, EventArgs e)
 
     }
 
-    private void OnRadioGroupOnSelectedItemChanged (object? s, SelectedItemChangedArgs selected) { DimChanged (); }
+    private void OnRadioGroupOnSelectedtemChanged (object? s, SelectedItemChangedArgs selected) { DimChanged (); }
 
     // These need to have same order 
     private readonly List<string> _dimNames = ["Absolute", "Auto", "Fill", "Func", "Percent",];

Examples/UICatalog/Scenarios/EditorsAndHelpers/EventLog.cs

@@ -82,7 +82,7 @@ public View? ViewToLog
                 _viewToLog.MouseClick += (s, args) => { Log ($"MouseClick: {args}"); };
                 _viewToLog.MouseWheel += (s, args) => { Log ($"MouseWheel: {args}"); };
                 _viewToLog.HandlingHotKey += (s, args) => { Log ($"HandlingHotKey: {args.Context}"); };
-                _viewToLog.Selecting += (s, args) => { Log ($"Selecting: {args.Context}"); };
+                _viewToLog.Activating += (s, args) => { Log ($"Activating: {args.Context}"); };
                 _viewToLog.Accepting += (s, args) => { Log ($"Accepting: {args.Context}"); };
             }
         }

Examples/UICatalog/Scenarios/ListViewWithSelection.cs

@@ -105,7 +105,7 @@ public override void Main ()
         _listView.OpenSelectedItem += (s, a) => LogEvent (s as View, a, "OpenSelectedItem");
         _listView.CollectionChanged += (s, a) => LogEvent (s as View, a, "CollectionChanged");
         _listView.Accepting += (s, a) => LogEvent (s as View, a, "Accept");
-        _listView.Selecting += (s, a) => LogEvent (s as View, a, "Select");
+        _listView.Activating += (s, a) => LogEvent (s as View, a, "Activating");
         _listView.VerticalScrollBar.AutoShow = true;
         _listView.HorizontalScrollBar.AutoShow = true;
 

Examples/UICatalog/Scenarios/Shortcuts.cs

@@ -427,7 +427,7 @@ select peer.Key.ToString ().GetColumns ()).Prepend (max)
             BoxWidth = 1
         };
 
-        bgColorShortcut.Selecting += (o, args) =>
+        bgColorShortcut.Activating += (o, args) =>
                                      {
                                          //args.Cancel = true;
                                      };
@@ -482,26 +482,26 @@ select peer.Key.ToString ().GetColumns ()).Prepend (max)
 
         foreach (Shortcut shortcut in Application.Top.SubViews.OfType<Shortcut> ())
         {
-            shortcut.Selecting += (o, args) =>
+            shortcut.Activating += (o, args) =>
                                   {
                                       if (args.Handled)
                                       {
                                           return;
                                       }
 
-                                      eventSource.Add ($"{shortcut!.Id}.Selecting: {shortcut!.CommandView.Text} {shortcut!.CommandView.GetType ().Name}");
+                                      eventSource.Add ($"{shortcut!.Id}.Activating: {shortcut!.CommandView.Text} {shortcut!.CommandView.GetType ().Name}");
                                       eventLog.MoveDown ();
                                   };
 
-            shortcut.CommandView.Selecting += (o, args) =>
+            shortcut.CommandView.Activating += (o, args) =>
                                               {
                                                   if (args.Handled)
                                                   {
                                                       return;
                                                   }
 
                                                   eventSource.Add (
-                                                                   $"{shortcut!.Id}.CommandView.Selecting: {shortcut!.CommandView.Text} {shortcut!.CommandView.GetType ().Name}");
+                                                                   $"{shortcut!.Id}.CommandView.Activating: {shortcut!.CommandView.Text} {shortcut!.CommandView.GetType ().Name}");
                                                   eventLog.MoveDown ();
                                                   args.Handled = true;
                                               };

Terminal.Gui/Input/Command.cs

@@ -48,12 +48,15 @@ public enum Command
     HotKey,
 
     /// <summary>
-    ///     Selects the View or an item in the View (e.g. a list item or menu item) without necessarily accepting it.
+    ///     Activates the View or an item in the View (e.g. a list item or menu item) without necessarily accepting it.
     ///     <para>
-    ///         The default implementation in <see cref="View"/> calls <see cref="View.RaiseSelecting"/>.
+    ///         In some cases, activating a View just sets focus to it, while in others it may trigger an action.
+    ///     </para>
+    ///     <para>
+    ///         The default implementation in <see cref="View"/> calls <see cref="View.RaiseActivating"/>.
     ///     </para>
     /// </summary>
-    Select,
+    Activate,
 
     #endregion
 

Terminal.Gui/ViewBase/View.Command.cs

@@ -36,12 +36,12 @@ private void SetupCommands ()
                         return true;
                     });
 
-        // Space or single-click - Raise Selecting
+        // Space or single-click - Raise Activating
         AddCommand (
-                    Command.Select,
+                    Command.Activate,
                     ctx =>
                     {
-                        if (RaiseSelecting (ctx) is true)
+                        if (RaiseActivating (ctx) is true)
                         {
                             return true;
                         }
@@ -107,7 +107,7 @@ private void SetupCommands ()
     /// <remarks>
     ///     <para>
     ///         The <see cref="Accepting"/> event should be raised after the state of the View has changed (after
-    ///         <see cref="Selecting"/> is raised).
+    ///         <see cref="Activating"/> is raised).
     ///     </para>
     ///     <para>
     ///         If the Accepting event is not handled, <see cref="Command.Accept"/> will be invoked on the SuperView, enabling
@@ -203,12 +203,12 @@ private void SetupCommands ()
     public event EventHandler<CommandEventArgs>? Accepting;
 
     /// <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="Accepting"/>.
-    ///     event. The default <see cref="Command.Select"/> handler calls this method.
+    ///     Called when the user has performed an action (e.g. <see cref="Command.Activate"/>) causing the View to be activated.
+    ///     Calls <see cref="OnActivating"/> which can be cancelled; if not cancelled raises <see cref="Accepting"/>.
+    ///     event. The default <see cref="Command.Activate"/> handler calls this method.
     /// </summary>
     /// <remarks>
-    ///     The <see cref="Selecting"/> event should be raised after the state of the View has been changed and before see
+    ///     The <see cref="Activating"/> event should be raised after the state of the View has been changed and before see
     ///     <see cref="Accepting"/>.
     /// </remarks>
     /// <returns>
@@ -217,40 +217,40 @@ private void SetupCommands ()
     ///     continue.
     ///     <see langword="true"/> if the event was raised and handled (or cancelled); input processing should stop.
     /// </returns>
-    protected bool? RaiseSelecting (ICommandContext? ctx)
+    protected bool? RaiseActivating (ICommandContext? ctx)
     {
         //Logging.Debug ($"{Title} ({ctx?.Source?.Title})");
         CommandEventArgs args = new () { Context = ctx };
 
         // Best practice is to invoke the virtual method first.
         // This allows derived classes to handle the event and potentially cancel it.
-        if (OnSelecting (args) || args.Handled)
+        if (OnActivating (args) || args.Handled)
         {
             return true;
         }
 
         // If the event is not canceled by the virtual method, raise the event to notify any external subscribers.
-        Selecting?.Invoke (this, args);
+        Activating?.Invoke (this, args);
 
-        return Selecting is null ? null : args.Handled;
+        return Activating is null ? null : args.Handled;
     }
 
     /// <summary>
-    ///     Called when the user has performed an action (e.g. <see cref="Command.Select"/>) causing the View to change state.
+    ///     Called when the user has performed an action (e.g. <see cref="Command.Activate"/>) causing the View to be activated.
     ///     Set CommandEventArgs.Handled to <see langword="true"/> and return <see langword="true"/> to indicate the event was
     ///     handled and processing should stop.
     /// </summary>
     /// <param name="args">The event arguments.</param>
     /// <returns><see langword="true"/> to stop processing.</returns>
-    protected virtual bool OnSelecting (CommandEventArgs args) { return false; }
+    protected virtual bool OnActivating (CommandEventArgs args) { return false; }
 
     /// <summary>
-    ///     Cancelable event raised when the user has performed an action (e.g. <see cref="Command.Select"/>) causing the View
-    ///     to change state.
+    ///     Cancelable event raised when the user has performed an action (e.g. <see cref="Command.Activate"/>) causing the View
+    ///     be activated.
     ///     Set CommandEventArgs.Handled to <see langword="true"/> to indicate the event was handled and processing should
     ///     stop.
     /// </summary>
-    public event EventHandler<CommandEventArgs>? Selecting;
+    public event EventHandler<CommandEventArgs>? Activating;
 
     /// <summary>
     ///     Called when the View is handling the user pressing the View's <see cref="HotKey"/>s. Calls

Terminal.Gui/ViewBase/View.Keyboard.cs

@@ -10,7 +10,7 @@ public partial class View // Keyboard APIs
     private void SetupKeyboard ()
     {
         KeyBindings = new (this);
-        KeyBindings.Add (Key.Space, Command.Select);
+        KeyBindings.Add (Key.Space, Command.Activate);
         KeyBindings.Add (Key.Enter, Command.Accept);
 
         HotKeyBindings = new (this);

Terminal.Gui/ViewBase/View.Mouse.cs

@@ -13,11 +13,11 @@ private void SetupMouse ()
         MouseBindings = new ();
 
         // TODO: Should the default really work with any button or just button1?
-        MouseBindings.Add (MouseFlags.Button1Clicked, Command.Select);
-        MouseBindings.Add (MouseFlags.Button2Clicked, Command.Select);
-        MouseBindings.Add (MouseFlags.Button3Clicked, Command.Select);
-        MouseBindings.Add (MouseFlags.Button4Clicked, Command.Select);
-        MouseBindings.Add (MouseFlags.Button1Clicked | MouseFlags.ButtonCtrl, Command.Select);
+        MouseBindings.Add (MouseFlags.Button1Clicked, Command.Activate);
+        MouseBindings.Add (MouseFlags.Button2Clicked, Command.Activate);
+        MouseBindings.Add (MouseFlags.Button3Clicked, Command.Activate);
+        MouseBindings.Add (MouseFlags.Button4Clicked, Command.Activate);
+        MouseBindings.Add (MouseFlags.Button1Clicked | MouseFlags.ButtonCtrl, Command.Activate);
     }
 
     /// <summary>
@@ -476,7 +476,7 @@ protected bool RaiseMouseClickEvent (MouseEventArgs args)
 
         // Post-conditions
 
-        // By default, this will raise Selecting/OnSelecting - Subclasses can override this via AddCommand (Command.Select ...).
+        // By default, this will raise Activating/OnActivating - Subclasses can override this via AddCommand (Command.Select ...).
         args.Handled = InvokeCommandsBoundToMouse (args) == true;
 
         return args.Handled;

Terminal.Gui/Views/Button.cs

@@ -75,7 +75,7 @@ public Button ()
     {
         bool cachedIsDefault = IsDefault; // Supports "Swap Default" in Buttons scenario where IsDefault changes
 
-        if (RaiseSelecting (commandContext) is true)
+        if (RaiseActivating (commandContext) is true)
         {
             return true;
         }

Terminal.Gui/Views/CharMap/CharMap.cs

@@ -43,7 +43,7 @@ public CharMap ()
         AddCommand (Command.ScrollLeft, () => ScrollHorizontal (-1));
 
         AddCommand (Command.Accept, HandleAcceptCommand);
-        AddCommand (Command.Select, HandleSelectCommand);
+        AddCommand (Command.Activate, HandleSelectCommand);
         AddCommand (Command.Context, HandleContextCommand);
 
         KeyBindings.Add (Key.CursorUp, Command.Up);
@@ -114,7 +114,7 @@ private void PaddingOnGettingAttributeForRole (object? sender, VisualRoleEventAr
 
     private bool? Move (ICommandContext? commandContext, int cpOffset)
     {
-        if (RaiseSelecting (commandContext) is true)
+        if (RaiseActivating (commandContext) is true)
         {
             return true;
         }
@@ -462,7 +462,7 @@ public static string ToCamelCase (string str)
             }
         }
 
-        if (RaiseSelecting (commandContext) is true)
+        if (RaiseActivating (commandContext) is true)
         {
             return true;
         }

Terminal.Gui/Views/CheckBox.cs

@@ -27,7 +27,7 @@ public CheckBox ()
         CanFocus = true;
 
         // Select (Space key and single-click) - Advance state and raise Select event - DO NOT raise Accept
-        AddCommand (Command.Select, AdvanceAndSelect);
+        AddCommand (Command.Activate, AdvanceAndSelect);
 
         // Hotkey - Advance state and raise Select event - DO NOT raise Accept
         AddCommand (Command.HotKey, ctx =>
@@ -58,7 +58,7 @@ public CheckBox ()
             return true;
         }
 
-        if (RaiseSelecting (commandContext) is true)
+        if (RaiseActivating (commandContext) is true)
         {
             return true;
         }

Terminal.Gui/Views/Color/ColorPicker.16.cs

@@ -70,7 +70,7 @@ public Point Cursor
     /// <returns></returns>
     private bool MoveDown (ICommandContext? commandContext)
     {
-        if (RaiseSelecting (commandContext) == true)
+        if (RaiseActivating (commandContext) == true)
         {
             return true;
         }
@@ -86,7 +86,7 @@ private bool MoveDown (ICommandContext? commandContext)
     /// <returns></returns>
     private bool MoveLeft (ICommandContext? commandContext)
     {
-        if (RaiseSelecting (commandContext) == true)
+        if (RaiseActivating (commandContext) == true)
         {
             return true;
         }
@@ -103,7 +103,7 @@ private bool MoveLeft (ICommandContext? commandContext)
     /// <returns></returns>
     private bool MoveRight (ICommandContext? commandContext)
     {
-        if (RaiseSelecting (commandContext) == true)
+        if (RaiseActivating (commandContext) == true)
         {
             return true;
         }
@@ -119,7 +119,7 @@ private bool MoveRight (ICommandContext? commandContext)
     /// <returns></returns>
     private bool MoveUp (ICommandContext? commandContext)
     {
-        if (RaiseSelecting (commandContext) == true)
+        if (RaiseActivating (commandContext) == true)
         {
             return true;
         }
@@ -195,7 +195,7 @@ private void AddCommands ()
         AddCommand (Command.Up, (ctx) => MoveUp (ctx));
         AddCommand (Command.Down, (ctx) => MoveDown (ctx));
 
-        AddCommand (Command.Select, (ctx) =>
+        AddCommand (Command.Activate, (ctx) =>
                                     {
                                         var set = false;
 

Terminal.Gui/Views/ComboBox.cs

@@ -111,7 +111,7 @@
     }
 
     /// <inheritdoc />
     protected override bool OnSettingScheme (ValueChangingEventArgs<Scheme?> args)
     {
         _listview.SetScheme(args.NewValue);
         return base.OnSettingScheme (args);
@@ -972,9 +972,9 @@
             }
         }
 
-        public override bool OnSelectedChanged ()
+        public override bool OnActivatedChanged ()
         {
-            bool res = base.OnSelectedChanged ();
+            bool res = base.OnActivatedChanged ();
 
             _highlighted = SelectedItem;
 

Terminal.Gui/Views/FileDialogs/FileDialog.cs

@@ -44,9 +44,9 @@
     private readonly TextField _tbFind;
     private readonly TextField _tbPath;
     private readonly TreeView<IFileSystemInfo> _treeView;
     private MenuBarItem _allowedTypeMenu;
     private MenuBar _allowedTypeMenuBar;
     private MenuItem [] _allowedTypeMenuItems;
     private int _currentSortColumn;
     private bool _currentSortIsAsc = true;
     private bool _disposed;
@@ -172,7 +172,7 @@
             FullRowSelect = true,
         };
         _tableView.CollectionNavigator = new FileDialogCollectionNavigator (this, _tableView);
-        _tableView.KeyBindings.ReplaceCommands (Key.Space, Command.Select);
+        _tableView.KeyBindings.ReplaceCommands (Key.Space, Command.Activate);
         _tableView.MouseClick += OnTableViewMouseClick;
         _tableView.Style.InvertSelectedCellFirstCharacter = true;
         Style.TableStyle = _tableView.Style;
@@ -605,7 +605,7 @@
         bool addCurrentStateToHistory,
         bool setPathText = true,
         bool clearForward = true,
         string pathText = null
     )
     {
         // no change of state
@@ -1109,7 +1109,7 @@
         bool addCurrentStateToHistory,
         bool setPathText = true,
         bool clearForward = true,
         string pathText = null
     )
     {
         if (State is SearchState search)

Terminal.Gui/Views/FlagSelector.cs

@@ -372,9 +372,9 @@ protected virtual CheckBox CreateCheckBox (string name, uint flag)
         //                                      }
         //                                  };
 
-        checkbox.Selecting += (sender, args) =>
+        checkbox.Activating += (sender, args) =>
                               {
-                                  if (RaiseSelecting (args.Context) is true)
+                                  if (RaiseActivating (args.Context) is true)
                                   {
                                       args.Handled = true;
 

Terminal.Gui/Views/HexView.cs

@@ -57,7 +57,7 @@ public HexView (Stream? source)
         _leftSideHasFocus = true;
         _firstNibble = true;
 
-        AddCommand (Command.Select, HandleMouseClick);
+        AddCommand (Command.Activate, HandleMouseClick);
         AddCommand (Command.Left, () => MoveLeft ());
         AddCommand (Command.Right, () => MoveRight ());
         AddCommand (Command.Down, () => MoveDown (BytesPerLine));
@@ -101,8 +101,8 @@ public HexView (Stream? source)
         KeyBindings.Remove (Key.Enter);
 
         // The Select handler deals with both single and double clicks
-        MouseBindings.ReplaceCommands (MouseFlags.Button1Clicked, Command.Select);
-        MouseBindings.Add (MouseFlags.Button1DoubleClicked, Command.Select);
+        MouseBindings.ReplaceCommands (MouseFlags.Button1Clicked, Command.Activate);
+        MouseBindings.Add (MouseFlags.Button1DoubleClicked, Command.Activate);
         MouseBindings.Add (MouseFlags.WheeledUp, Command.ScrollUp);
         MouseBindings.Add (MouseFlags.WheeledDown, Command.ScrollDown);
 
@@ -363,7 +363,7 @@ public int AddressWidth
             return false;
         }
 
-        if (RaiseSelecting (commandContext) is true)
+        if (RaiseActivating (commandContext) is true)
         {
             return true;
         }