Fixes #4183 - BREAKING CHANGE - Finishes Adornments and Rewrites TabView

AGENTS.md

@@ -59,6 +59,24 @@ dotnet run
 **Test:** `dotnet test --project Tests/UnitTests --no-build && dotnet test --project Tests/UnitTestsParallelizable --no-build`
 **Details:** [Build & Test Workflow](.claude/workflows/build-test-workflow.md)
 
+### xUnit v3 Test Filtering (Microsoft Testing Platform)
+
+This project uses **xUnit v3** with Microsoft Testing Platform. The old `--filter "FullyQualifiedName~Foo"` syntax does **NOT** work. Use these instead:
+
+```bash
+# Run a single test by method name
+dotnet test --project Tests/UnitTestsParallelizable --no-build --filter-method "*MyTestMethod"
+
+# Run all tests in a class
+dotnet test --project Tests/UnitTestsParallelizable --no-build --filter-class "*MyTestClass"
+
+# Query filter language (xUnit v3 native): /<assembly>/<namespace>/<class>/<method>
+dotnet test --project Tests/UnitTestsParallelizable --no-build --filter "/*/*/MyTestClass/MyTestMethod"
+
+# Show live test output (ITestOutputHelper)
+dotnet test --project Tests/UnitTestsParallelizable --no-build --filter-method "*MyTest" -- --show-live-output on
+```
+
 ## Quick Rules
 
 **⚠️ READ THIS BEFORE MODIFYING ANY FILE - These are Terminal.Gui-specific conventions:**
@@ -68,7 +86,7 @@ dotnet run
 3. **Use `[...]`** - Collection expressions, not `new () { ... }`
 4. **SubView/SuperView** - Never say "child", "parent", or "container"
 5. **Unused lambda params** - Use `_` discard: `(_, _) => { }`
-6. **Local functions** - Use camelCase: `void myLocalFunc ()`
+6. **Local functions** - Use PascalCase: `void MyLocalFunc ()`
 7. **Backing fields** - Place immediately before their property
 8. **Early return** - Prefer guard clauses over nested `if`/`else`
 9. **One type per file** - Public and internal types each get their own file

Examples/UICatalog/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "UICatalog": {
       "commandName": "Project",
-      "commandLineArgs": "--debug-log-level Debug"
+      "commandLineArgs": "--debug-log-level Trace"
     },
     "UICatalog --driver windows": {
       "commandName": "Project",

Examples/UICatalog/Scenarios/Adornments.cs

@@ -50,10 +50,12 @@ public override void Main ()
 
         Window window = new ()
         {
-            Title = "The _Window",
+            Title = "The _Window - The Title is long",
             Arrangement = ViewArrangement.Overlapped | ViewArrangement.Movable | ViewArrangement.Resizable,
-            Width = Dim.Fill (adornmentsEditor),
-            Height = Dim.Fill (viewportSettingsEditor)
+            X = 5,
+            Y = 5,
+            Width = Dim.Fill (adornmentsEditor) - 10,
+            Height = Dim.Fill (viewportSettingsEditor) - 10
         };
         appWindow.Add (window);
 
@@ -100,14 +102,80 @@ public override void Main ()
 
         window.Margin.GetOrCreateView ();
         window.Margin.View?.Text = "Margin Text";
-        window.Margin.Thickness = new Thickness (2);
+        window.Margin.Thickness = new Thickness (0);
 
         window.Border.GetOrCreateView ();
+
         //window.Border.View.Text = "Border Text";
         window.Border.Thickness = new Thickness (3);
-        window.Border.View?.SetScheme (SchemeManager.GetScheme (Schemes.Dialog));
 
-        window.Border.GetOrCreateView ();
+        //window.Border.View?.SetScheme (SchemeManager.GetScheme (Schemes.Dialog));
+
+        window.Border.Settings = BorderSettings.Tab | BorderSettings.Title;
+        window.BorderStyle = LineStyle.Rounded;
+
+        // Enable dragging the tab title to slide it by changing TabOffset.
+        // Hook into TitleView.MouseEvent — it fires before the Arranger, so no conflict.
+        Point? dragStart = null;
+        var dragStartOffset = 0;
+        var tabDragHooked = false;
+
+        window.DrawComplete += (_, _) =>
+                               {
+                                   if (tabDragHooked || ((BorderView)window.Border.View!).TitleView is not { } tabTitle)
+                                   {
+                                       return;
+                                   }
+
+                                   tabDragHooked = true;
+                                   var bv = (BorderView)window.Border.View!;
+
+                                   tabTitle.MouseEvent += (_, mouse) =>
+                                                          {
+                                                              // Start drag
+                                                              if (!dragStart.HasValue && mouse.Flags.HasFlag (MouseFlags.LeftButtonPressed))
+                                                              {
+                                                                  dragStart = mouse.ScreenPosition;
+                                                                  dragStartOffset = bv.TabOffset;
+                                                                  window.App?.Mouse.GrabMouse (tabTitle);
+                                                                  mouse.Handled = true;
+                                                              }
+
+                                                              // Dragging
+                                                              if (dragStart.HasValue
+                                                                  && mouse.Flags is (MouseFlags.LeftButtonPressed | MouseFlags.PositionReport))
+                                                              {
+                                                                  int delta = bv.TabSide is Side.Top or Side.Bottom
+                                                                                  ? mouse.ScreenPosition.X - dragStart.Value.X
+                                                                                  : mouse.ScreenPosition.Y - dragStart.Value.Y;
+
+                                                                  int tabLen = bv.TabLength ?? 0;
+
+                                                                  // Content border edge length (the side the tab slides along)
+                                                                  int edgeLen = bv.TabSide is Side.Top or Side.Bottom
+                                                                                    ? window.Frame.Width
+                                                                                      - window.Border.Thickness.Left
+                                                                                      - window.Border.Thickness.Right
+                                                                                    : window.Frame.Height
+                                                                                      - window.Border.Thickness.Top
+                                                                                      - window.Border.Thickness.Bottom;
+
+                                                                  int newOffset = Math.Clamp (dragStartOffset + delta, 1 - tabLen, edgeLen - 1);
+
+                                                                  bv.TabOffset = newOffset;
+                                                                  mouse.Handled = true;
+                                                              }
+
+                                                              // Release
+                                                              if (!mouse.Flags.HasFlag (MouseFlags.LeftButtonReleased) || !dragStart.HasValue)
+                                                              {
+                                                                  return;
+                                                              }
+                                                              dragStart = null;
+                                                              window.App?.Mouse.UngrabMouse ();
+                                                              mouse.Handled = true;
+                                                          };
+                               };
         window.Padding.View?.Text = "Padding Text line 1\nPadding Text line 3\nPadding Text line 3\nPadding Text line 4\nPadding Text line 5";
         window.Padding.Thickness = new Thickness (1);
         window.Padding.View?.SetScheme (SchemeManager.GetScheme (Schemes.Menu));
@@ -180,6 +248,12 @@ public override void Main ()
 
         appWindow.Add (adornmentsEditor, viewportSettingsEditor);
 
+        appWindow.DrawingContent += (_, e) =>
+                                    {
+                                        appWindow.FillRect (appWindow.Viewport, Glyphs.Diamond);
+                                        e.Cancel = true;
+                                    };
+
         app.Run (appWindow);
     }
 }

Examples/UICatalog/Scenarios/AnsiRequestsScenario.cs

@@ -31,29 +31,38 @@ public override void Main ()
         app.Init ();
         _app = app;
 
-        TabView tv = new () { Width = Dim.Fill (), Height = Dim.Fill (), CanFocus = true };
-
-        Tab single = new ();
-        single.DisplayText = "Single";
-        single.View = BuildSingleTab ();
-
-        Tab bulk = new ();
-        bulk.DisplayText = "Multi";
-        bulk.View = BuildBulkTab ();
-
-        tv.AddTab (single, true);
-        tv.AddTab (bulk, false);
+        // Restored: Tabs with Single and Bulk tabs (#4183)
+        View singleView = BuildSingleTab ();
+        View bulkView = BuildBulkTab ();
 
         // Setup - Create a top-level application window and configure it.
         using Window appWindow = new ();
         appWindow.Title = GetQuitKeyAndName ();
 
-        appWindow.Add (tv);
+        Tabs tabs = new ()
+        {
+            Width = Dim.Fill (),
+            Height = Dim.Fill ()
+        };
+
+        View singleTab = new () { Title = "_Single" };
+        singleView.Width = Dim.Fill ();
+        singleView.Height = Dim.Fill ();
+        singleTab.Add (singleView);
+
+        View bulkTab = new () { Title = "_Bulk" };
+        bulkView.Width = Dim.Fill ();
+        bulkView.Height = Dim.Fill ();
+        bulkTab.Add (bulkView);
+
+        tabs.Add (singleTab, bulkTab);
+        tabs.Value = singleTab;
+
+        appWindow.Add (tabs);
 
         // Run - Start the application.
         app.Run (appWindow);
-        bulk.View.Dispose ();
-        single.View.Dispose ();
+        tabs.Dispose ();
 
         _app.RemoveTimeout (_updateTimeoutToken!);
         _app.RemoveTimeout (_sendDarTimeoutToken!);

Examples/UICatalog/Scenarios/Arrangement.cs

@@ -18,6 +18,7 @@ public override void Main ()
         app.Init ();
 
         using Window mainWindow = new ();
+        mainWindow.SchemeName = SchemeManager.SchemesToSchemeName (Schemes.Dialog);
         mainWindow.Title = GetQuitKeyAndName ();
         mainWindow.TabStop = TabBehavior.TabGroup;
         mainWindow.ShadowStyle = null;

Examples/UICatalog/Scenarios/ConfigurationEditor.cs

@@ -4,14 +4,14 @@
 namespace UICatalog.Scenarios;
 
 [ScenarioMetadata ("Configuration Editor", "Edits of Terminal.Gui Config Files")]
-[ScenarioCategory ("TabView")]
+[ScenarioCategory ("Tabs")]
 [ScenarioCategory ("Colors")]
 [ScenarioCategory ("Files and IO")]
 [ScenarioCategory ("TextView")]
 [ScenarioCategory ("Configuration")]
 public class ConfigurationEditor : Scenario
 {
-    private TabView? _tabView;
+    private Tabs? _tabs;
     private Shortcut? _lenShortcut;
     private IApplication? _app;
 
@@ -41,14 +41,12 @@ public override void Main ()
 
         StatusBar statusBar = new ([quitShortcut, reloadShortcut, saveShortcut, _lenShortcut]);
 
-        _tabView = new TabView { Width = Dim.Fill (), Height = Dim.Fill (to: statusBar) };
+        _tabs = new Tabs { Width = Dim.Fill (), Height = Dim.Fill (statusBar) };
 
-        win.Add (_tabView, statusBar);
-
-        win.IsModalChanged += (_, _) => { Open (); };
+        win.Add (_tabs, statusBar);
 
         ConfigurationManager.Applied += ConfigurationManagerOnApplied;
-
+        Open ();
         app.Run (win);
 
         return;
@@ -84,40 +82,43 @@ private void Open ()
                 editor.Title = "HardCoded";
             }
 
-            Tab tab = new () { View = editor, DisplayText = config.Key.ToString () };
+            View tab = new () { Title = config.Key.ToString () };
+            tab.Add (editor);
 
-            _tabView!.AddTab (tab, false);
+            _tabs?.Add (tab);
 
             editor.Read ();
 
-            editor.ContentsChanged += (_, _) =>
-                                      {
-                                          _lenShortcut!.Title = _lenShortcut!.Title.Replace ("*", "");
-
-                                          if (editor.IsDirty)
-                                          {
-                                              _lenShortcut!.Title += "*";
-                                          }
-                                      };
+            //editor.ContentsChanged += OnEditorOnContentsChanged;
 
-            _lenShortcut!.Title = $"{editor.Title}";
+            _lenShortcut?.Title = $"{editor.Title}";
         }
 
-        _tabView!.SelectedTabChanged += (_, args) => { _lenShortcut!.Title = $"{args.NewTab.View!.Title}"; };
+        _tabs?.ValueChanged += (_, args) =>
+                               {
+                                   ConfigTextView? editor = args.NewValue?.SubViews.OfType<ConfigTextView> ().FirstOrDefault ();
+
+                                   if (editor is { })
+                                   {
+                                       _lenShortcut!.Title = $"{editor.Title}";
+                                   }
+                               };
+    }
+
+    private void OnEditorOnContentsChanged (object? o, ContentsChangedEventArgs contentsChangedEventArgs)
+    {
+        var editor = (ConfigTextView)o!;
+        _lenShortcut?.Title = _lenShortcut.Title.Replace ("*", "");
+
+        if (editor.IsDirty)
+        {
+            _lenShortcut?.Title += "*";
+        }
     }
 
     private void Quit ()
     {
-        foreach (ConfigTextView editor in _tabView!.Tabs.Select (v =>
-                                                                 {
-                                                                     if (v.View is ConfigTextView ctv)
-                                                                     {
-                                                                         return ctv;
-                                                                     }
-
-                                                                     return null;
-                                                                 })
-                                                   .Cast<ConfigTextView> ())
+        foreach (ConfigTextView editor in _tabs?.TabCollection.SelectMany (t => t.SubViews.OfType<ConfigTextView> ()) ?? [])
         {
             if (!editor.IsDirty)
             {
@@ -139,7 +140,7 @@ private void Quit ()
             }
         }
 
-        _tabView?.App?.RequestStop ();
+        _tabs?.App?.RequestStop ();
     }
 
     private void Reload ()

Examples/UICatalog/Scenarios/Editor.cs

@@ -27,7 +27,6 @@ public class Editor : Scenario
     private CheckBox? _miForceMinimumPosToZeroCheckBox;
     private byte []? _originalText;
     private bool _saved = true;
-    private TabView? _tabView;
     private string _textToFind = string.Empty;
     private string _textToReplace = string.Empty;
     private TextView? _textView;
@@ -935,16 +934,14 @@ private void SetFindText ()
 
     private void ShowFindReplace (bool isFind = true)
     {
-        if (_findReplaceWindow is null || _tabView is null)
+        if (_findReplaceWindow is null)
         {
             return;
         }
 
         _findReplaceWindow.Visible = true;
         _findReplaceWindow.SuperView?.MoveSubViewToStart (_findReplaceWindow);
-        _tabView.SetFocus ();
-        _tabView.SelectedTab = isFind ? _tabView.Tabs.ToArray () [0] : _tabView.Tabs.ToArray () [1];
-        _tabView.SelectedTab?.View?.FocusDeepest (NavigationDirection.Forward, null);
+        _findReplaceWindow.FocusDeepest (NavigationDirection.Forward, null);
     }
 
     private void CreateFindReplace ()
@@ -956,14 +953,29 @@ private void CreateFindReplace ()
 
         _findReplaceWindow = new FindReplaceWindow (_textView);
 
-        _tabView = new TabView { X = 0, Y = 0, Width = Dim.Fill (), Height = Dim.Fill (0) };
+        // Restored: Tabs with Find and Replace tabs (#4183)
+        Tabs tabs = new ()
+        {
+            Width = Dim.Fill (),
+            Height = Dim.Fill ()
+        };
+
+        View findTab = new () { Title = "_Find" };
+        View findView = CreateFindTab ();
+        findView.Width = Dim.Fill ();
+        findView.Height = Dim.Fill ();
+        findTab.Add (findView);
 
-        _tabView.AddTab (new Tab { DisplayText = "Find", View = CreateFindTab () }, true);
-        _tabView.AddTab (new Tab { DisplayText = "Replace", View = CreateReplaceTab () }, false);
+        View replaceTab = new () { Title = "_Replace" };
+        View replaceView = CreateReplaceTab ();
+        replaceView.Width = Dim.Fill ();
+        replaceView.Height = Dim.Fill ();
+        replaceTab.Add (replaceView);
 
-        _tabView.SelectedTabChanged += (s, e) => { _tabView.SelectedTab?.View?.FocusDeepest (NavigationDirection.Forward, null); };
+        tabs.Add (findTab, replaceTab);
+        tabs.Value = findTab;
 
-        _findReplaceWindow.Add (_tabView);
+        _findReplaceWindow.Add (tabs);
         _findReplaceWindow.Visible = false;
         _appWindow.Add (_findReplaceWindow);
     }