Fixes #4050 - Select->Activate

Examples/Example/Example.cs

@@ -67,7 +67,7 @@ public ExampleWindow ()
 
             // center the login button horizontally
             X = Pos.Center (),
-            IsDefault = true
+            IsDefaultAcceptView = true
         };
 
         // When login button is clicked display a message popup

Examples/NativeAot/Program.cs

@@ -93,7 +93,7 @@ public ExampleWindow ()
 
             // center the login button horizontally
             X = Pos.Center (),
-            IsDefault = true
+            IsDefaultAcceptView = true
         };
 
         // When login button is clicked display a message popup

Examples/SelfContained/Program.cs

@@ -92,7 +92,7 @@ public ExampleWindow ()
 
             // center the login button horizontally
             X = Pos.Center (),
-            IsDefault = true
+            IsDefaultAcceptView = true
         };
 
         // When login button is clicked display a message popup

Examples/UICatalog/Scenarios/AllViewsTester.cs

@@ -158,16 +158,13 @@ public override void Main ()
 
         _eventLog = new ()
         {
-            // X = Pos.Right(_layoutEditor),
+            X = Pos.AnchorEnd () - 1,
+            Y = 0,
+            Width = 30,
+            Height = Dim.Fill (),
             SuperViewRendersLineCanvas = true
         };
         _eventLog.Border!.Thickness = new (1);
-        _eventLog.X = Pos.AnchorEnd () - 1;
-        _eventLog.Y = 0;
-
-        _eventLog.Height = Dim.Height (_classListView);
-
-        //_eventLog.Width = 30;
 
         _layoutEditor.Width = Dim.Fill (
                                         Dim.Func (
@@ -194,7 +191,6 @@ public override void Main ()
             Height = Dim.Fill (),
             CanFocus = true,
             TabStop = TabBehavior.TabStop,
-            //SchemeName = SchemeManager.SchemesToSchemeName (Schemes.Base),
             Arrangement = ViewArrangement.LeftResizable | ViewArrangement.BottomResizable | ViewArrangement.RightResizable,
             BorderStyle = LineStyle.Double,
             SuperViewRendersLineCanvas = true
@@ -228,7 +224,7 @@ private void CreateCurrentView (Type type)
         if (type.IsGenericType)
         {
             // For each of the <T> arguments
-            List<Type> typeArguments = new ();
+            List<Type> typeArguments = [];
 
             // use <object> or the original type if applicable
             foreach (Type arg in type.GetGenericArguments ())

Examples/UICatalog/Scenarios/AnsiRequestsScenario.cs

@@ -149,7 +149,7 @@ private View BuildSingleTab ()
         var tvTerminator = new TextView { X = Pos.Left (label), Y = Pos.Bottom (label), Width = 4, Height = 4, ReadOnly = true };
         w.Add (label, tvTerminator);
 
-        var btnResponse = new Button { X = Pos.Center (), Y = Pos.Bottom (tvResponse) + 2, Text = "Send Request", IsDefault = true };
+        var btnResponse = new Button { X = Pos.Center (), Y = Pos.Bottom (tvResponse) + 2, Text = "Send Request", IsDefaultAcceptView = true };
 
         var lblSuccess = new Label { X = Pos.Center (), Y = Pos.Bottom (btnResponse) + 1 };
         w.Add (lblSuccess);

Examples/UICatalog/Scenarios/Bars.cs

@@ -185,9 +185,9 @@ void PopOverMenuOnAccept (object o, CommandEventArgs args)
 
         menuLikeExamples.Add (popOverMenu);
 
-        menuLikeExamples.MouseClick += MenuLikeExamplesMouseClick;
+        menuLikeExamples.MouseEvent += MenuLikeExamplesMouseEvent;
 
-        void MenuLikeExamplesMouseClick (object sender, MouseEventArgs e)
+        void MenuLikeExamplesMouseEvent (object _, MouseEventArgs e)
         {
             if (e.Flags.HasFlag (MouseFlags.Button3Clicked))
             {

Examples/UICatalog/Scenarios/Buttons.cs

@@ -20,17 +20,17 @@ public override void Main ()
             Title = GetQuitKeyAndName ()
         };
 
-        // Add a label & text field so we can demo IsDefault
-        var editLabel = new Label { X = 0, Y = 0, Text = "TextField (to demo IsDefault):" };
+        // Add a label & text field so we can demo IsDefaultAcceptView
+        var editLabel = new Label { X = 0, Y = 0, Text = "TextField (to demo IsDefaultAcceptView):" };
         main.Add (editLabel);
 
         // Add a TextField using Absolute layout. 
         var edit = new TextField { X = 31, Width = 15, HotKey = Key.Y.WithAlt };
         main.Add (edit);
 
-        // This is the default button (IsDefault = true); if user presses ENTER in the TextField
+        // This is the default button (IsDefaultAcceptView = true); if user presses ENTER in the TextField
         // the scenario will quit
-        var defaultButton = new Button { X = Pos.Center (), Y = Pos.AnchorEnd (), IsDefault = true, Text = "_Quit" };
+        var defaultButton = new Button { X = Pos.Center (), Y = Pos.AnchorEnd (), IsDefaultAcceptView = true, Text = "_Quit" };
 
         main.Add (defaultButton);
 
@@ -48,14 +48,14 @@ public override void Main ()
 
         swapButton.Accepting += (s, e) =>
                              {
-                                 e.Handled = !swapButton.IsDefault;
-                                 defaultButton.IsDefault = !defaultButton.IsDefault;
-                                 swapButton.IsDefault = !swapButton.IsDefault;
+                                 e.Handled = !swapButton.IsDefaultAcceptView;
+                                 defaultButton.IsDefaultAcceptView = !defaultButton.IsDefaultAcceptView;
+                                 swapButton.IsDefaultAcceptView = !swapButton.IsDefaultAcceptView;
                              };
 
         defaultButton.Accepting += (s, e) =>
                                 {
-                                    e.Handled = !defaultButton.IsDefault;
+                                    e.Handled = !defaultButton.IsDefaultAcceptView;
 
                                     if (e.Handled)
                                     {

Examples/UICatalog/Scenarios/CharacterMap/CharacterMap.cs

@@ -106,9 +106,15 @@ public override void Main ()
 
         _categoryList.Table = CreateCategoryTable (0, isDescending);
 
-        // if user clicks the mouse in TableView
-        _categoryList.MouseClick += (s, e) =>
+        // if user clicks the mouse in TableView, change sorting by that column
+        _categoryList.Activating += (s, commandEventArgs) =>
                                     {
+                                        if (commandEventArgs.Context is not CommandContext<MouseBinding> mouseContext)
+                                        {
+                                            return;
+                                        }
+
+                                        MouseEventArgs e = mouseContext.Binding.MouseEventArgs!;
                                         _categoryList.ScreenToCell (e.Position, out int? clickedCol);
 
                                         if (clickedCol != null && e.Flags.HasFlag (MouseFlags.Button1Clicked))

Examples/UICatalog/Scenarios/ContextMenus.cs

@@ -3,7 +3,7 @@
 
 namespace UICatalog.Scenarios;
 
-[ScenarioMetadata ("ContextMenus", "Context Menu Sample.")]
+[ScenarioMetadata ("ContextMenus", "Demonstrates using PopoverMenu as a Context Menu.")]
 [ScenarioCategory ("Menus")]
 public class ContextMenus : Scenario
 {
@@ -26,6 +26,21 @@ public override void Main ()
             SchemeName = "Toplevel"
         };
 
+        // Create keyboard and mouse bindings for the context menu.
+        appWindow.KeyBindings.Add (_winContextMenuKey, Command.Context);
+        appWindow.MouseBindings.Add (MouseFlags.Button3Clicked, Command.Context);
+
+        // View.AddCommand is protected; but we can use the CommandNotBound event to handle Command.Context
+        appWindow.CommandNotBound += (s, e) =>
+        {
+            if (e.Context!.Command == Command.Context)
+            {
+                // ReSharper disable once AccessToDisposedClosure
+                _winContextMenu?.MakeVisible ();
+                e.Handled = true;
+            }
+        };
+
         var text = "Context Menu";
         var width = 20;
 
@@ -60,43 +75,16 @@ public override void Main ()
         _tfBottomRight = new () { Id = "_tfBottomRight", X = Pos.AnchorEnd (width), Y = Pos.AnchorEnd (1), Width = width, Text = text };
         appWindow.Add (_tfBottomRight);
 
-        appWindow.KeyDown += OnAppWindowOnKeyDown;
-        appWindow.MouseClick += OnAppWindowOnMouseClick;
-
         CultureInfo originalCulture = Thread.CurrentThread.CurrentUICulture;
         appWindow.Closed += (s, e) => { Thread.CurrentThread.CurrentUICulture = originalCulture; };
 
         // Run - Start the application.
         Application.Run (appWindow);
         appWindow.Dispose ();
-        appWindow.KeyDown -= OnAppWindowOnKeyDown;
-        appWindow.MouseClick -= OnAppWindowOnMouseClick;
         _winContextMenu?.Dispose ();
 
         // Shutdown - Calling Application.Shutdown is required.
         Application.Shutdown ();
-
-        return;
-
-        void OnAppWindowOnMouseClick (object s, MouseEventArgs e)
-        {
-            if (e.Flags == MouseFlags.Button3Clicked)
-            {
-                // ReSharper disable once AccessToDisposedClosure
-                _winContextMenu?.MakeVisible (e.ScreenPosition);
-                e.Handled = true;
-            }
-        }
-
-        void OnAppWindowOnKeyDown (object s, Key e)
-        {
-            if (e == _winContextMenuKey)
-            {
-                // ReSharper disable once AccessToDisposedClosure
-                _winContextMenu?.MakeVisible ();
-                e.Handled = true;
-            }
-        }
     }
 
     private void CreateWinContextMenu ()
@@ -182,7 +170,12 @@ private Menuv2 GetSupportedCultureMenu ()
         {
             MenuItemv2 culture = new ();
 
-            culture.CommandView = new CheckBox { CanFocus = false };
+            culture.CommandView = new CheckBox
+            {
+                // Best practice for CheckBoxes in menus is to disable focus and highlight states
+                CanFocus = false,
+                HighlightStates = MouseState.None
+            };
 
             if (index == -1)
             {
@@ -198,7 +191,12 @@ private Menuv2 GetSupportedCultureMenu ()
 
                 index++;
                 culture = new ();
-                culture.CommandView = new CheckBox { CanFocus = false };
+                culture.CommandView = new CheckBox
+                {
+                    // Best practice for CheckBoxes in menus is to disable focus and highlight states
+                    CanFocus = false,
+                    HighlightStates = MouseState.None
+                };
             }
 
             culture.Id = $"_{c.Parent.EnglishName}";

Examples/UICatalog/Scenarios/CsvEditor.cs

@@ -301,7 +301,7 @@ private bool GetText (string title, string label, string initialText, out string
     {
         var okPressed = false;
 
-        var ok = new Button { Text = "Ok", IsDefault = true };
+        var ok = new Button { Text = "Ok", IsDefaultAcceptView = true };
 
         ok.Accepting += (s, e) =>
                      {

Examples/UICatalog/Scenarios/Dialogs.cs

@@ -151,18 +151,16 @@ public override void Main ()
         };
         frame.Add (label);
 
-        // Add hotkeys
-        var labels = Enum.GetNames<Alignment> ().Select (n => n = "_" + n);
-        var alignmentGroup = new RadioGroup
+        List<string> labels = Enum.GetNames<Alignment> ().Select (n => n = "_" + n).ToList ();
+        OptionSelector alignmentGroup = new ()
         {
             X = Pos.Right (label) + 1,
             Y = Pos.Top (label),
-            RadioLabels = labels.ToArray (),
             Title = "Ali_gn",
-            BorderStyle = LineStyle.Dashed
+            Labels = labels,
         };
         frame.Add (alignmentGroup);
-        alignmentGroup.SelectedItem = labels.ToList ().IndexOf ("_" + Dialog.DefaultButtonAlignment.ToString ());
+        alignmentGroup.Value = labels.IndexOf ("_" + Dialog.DefaultButtonAlignment.ToString ());
 
         frame.ValidatePosDim = true;
 
@@ -181,7 +179,7 @@ public override void Main ()
 
         var showDialogButton = new Button
         {
-            X = Pos.Center (), Y = Pos.Bottom (frame) + 2, IsDefault = true, Text = "_Show Dialog"
+            X = Pos.Center (), Y = Pos.Bottom (frame) + 2, IsDefaultAcceptView = true, Text = "_Show Dialog"
         };
 
         app.Accepting += (s, e) =>
@@ -216,7 +214,7 @@ private Dialog CreateDemoDialog (
         TextField titleEdit,
         TextField numButtonsEdit,
         CheckBox glyphsNotWords,
-        RadioGroup alignmentRadioGroup,
+        OptionSelector alignmentGroup,
         Label buttonPressedLabel
     )
     {
@@ -246,12 +244,12 @@ Label buttonPressedLabel
                     button = new ()
                     {
                         Text = "_" + NumberToWords.Convert (buttonId) + " " + char.ConvertFromUtf32 (buttonId + CODE_POINT),
-                        IsDefault = buttonId == 0
+                        IsDefaultAcceptView = buttonId == 0
                     };
                 }
                 else
                 {
-                    button = new () { Text = "_" + NumberToWords.Convert (buttonId), IsDefault = buttonId == 0 };
+                    button = new () { Text = "_" + NumberToWords.Convert (buttonId), IsDefaultAcceptView = buttonId == 0 };
                 }
 
                 button.Accepting += (s, e) =>
@@ -269,7 +267,7 @@ Label buttonPressedLabel
             {
                 Title = titleEdit.Text,
                 Text = "Dialog Text",
-                ButtonAlignment = (Alignment)Enum.Parse (typeof (Alignment), alignmentRadioGroup.RadioLabels [alignmentRadioGroup.SelectedItem].Substring (1)),
+                ButtonAlignment = (Alignment)Enum.Parse (typeof (Alignment), alignmentGroup.Labels! [(int)alignmentGroup.Value!.Value] [1..]),
 
                 Buttons = buttons.ToArray ()
             };
@@ -300,12 +298,12 @@ Label buttonPressedLabel
                                   button = new ()
                                   {
                                       Text = "_" + NumberToWords.Convert (buttonId) + " " + char.ConvertFromUtf32 (buttonId + CODE_POINT),
-                                      IsDefault = buttonId == 0
+                                      IsDefaultAcceptView = buttonId == 0
                                   };
                               }
                               else
                               {
-                                  button = new () { Text = "_" + NumberToWords.Convert (buttonId), IsDefault = buttonId == 0 };
+                                  button = new () { Text = "_" + NumberToWords.Convert (buttonId), IsDefaultAcceptView = buttonId == 0 };
                               }
 
                               button.Accepting += (s, e) =>

Examples/UICatalog/Scenarios/DynamicMenuBar.cs

@@ -391,7 +391,7 @@ public DynamicMenuItem EnterMenuItem ()
                 EditMenuBarItem (_menuItem);
             }
 
-            var btnOk = new Button { IsDefault = true, Text = "Ok" };
+            var btnOk = new Button { IsDefaultAcceptView = true, Text = "Ok" };
 
             btnOk.Accepting += (s, e) =>
                             {

Examples/UICatalog/Scenarios/DynamicStatusBar.cs

@@ -178,7 +178,7 @@ public DynamicStatusItem EnterStatusItem ()
                 EditStatusItem (_statusItem);
             }
 
-            var btnOk = new Button { IsDefault = true, Text = "OK" };
+            var btnOk = new Button { IsDefaultAcceptView = true, Text = "OK" };
 
             btnOk.Accepting += (s, e) =>
                               {

Examples/UICatalog/Scenarios/Editor.cs

@@ -894,7 +894,7 @@ private View CreateFindTab ()
             X = Pos.Align (Alignment.Center),
             Y = Pos.AnchorEnd (),
             Enabled = !string.IsNullOrEmpty (txtToFind.Text),
-            IsDefault = true,
+            IsDefaultAcceptView = true,
 
             Text = "Find _Next"
         };
@@ -1122,7 +1122,7 @@ private View CreateReplaceTab ()
             X = Pos.Align (Alignment.Center),
             Y = Pos.AnchorEnd (),
             Enabled = !string.IsNullOrEmpty (txtToFind.Text),
-            IsDefault = true,
+            IsDefaultAcceptView = true,
             Text = "Replace _Next"
         };
         btnFindNext.Accepting += (s, e) => ReplaceNext ();

Examples/UICatalog/Scenarios/EditorsAndHelpers/AllViewsView.cs

@@ -56,7 +56,6 @@ public AllViewsView ()
         KeyBindings.Add (Key.End, Command.End);
         KeyBindings.Add (PopoverMenu.DefaultKey, Command.Context);
 
-        MouseBindings.Add (MouseFlags.Button1DoubleClicked, Command.Accept);
         MouseBindings.ReplaceCommands (MouseFlags.Button3Clicked, Command.Context);
         MouseBindings.ReplaceCommands (MouseFlags.Button1Clicked | MouseFlags.ButtonCtrl, Command.Context);
         MouseBindings.Add (MouseFlags.WheeledDown, Command.ScrollDown);