Partial #2975 - Deprecate v1 Menu classes

Terminal.Gui/Application/Application.Run.cs

@@ -193,6 +193,11 @@ public static RunState Begin (Toplevel toplevel)
             toplevel.EndInit (); // Calls Layout
         }
 
+        // Call ConfigurationManager Apply here to ensure all subscribers to ConfigurationManager.Applied
+        // can update their state appropriately.
+        // BUGBUG: DO NOT DO THIS. Leave this commented out until we can figure out how to do this right
+        //Apply ();
+
         // Try to set initial focus to any TabStop
         if (!toplevel.HasFocus)
         {

Terminal.Gui/Configuration/AttributeJsonConverter.cs

@@ -92,7 +92,7 @@ public override Attribute Read (ref Utf8JsonReader reader, Type typeToConvert, J
             }
         }
 
-        throw new JsonException ();
+        throw new JsonException ("Attribute");
     }
 
     public override void Write (Utf8JsonWriter writer, Attribute value, JsonSerializerOptions options)

Terminal.Gui/Configuration/ConfigurationManager.cs

@@ -258,6 +258,7 @@ public static void Load (bool reset = false)
             Settings?.UpdateFromResource (Assembly.GetEntryAssembly ()!, embeddedStylesResourceName!, ConfigLocations.AppResources);
         }
 
+        // TODO: Determine if Runtime should be applied last.
         if (Locations.HasFlag (ConfigLocations.Runtime) && !string.IsNullOrEmpty (RuntimeConfig))
         {
             Settings?.Update (RuntimeConfig, "ConfigurationManager.RuntimeConfig", ConfigLocations.Runtime);

Terminal.Gui/Configuration/ScopeJsonConverter.cs

@@ -96,6 +96,8 @@ public override scopeT Read (ref Utf8JsonReader reader, Type typeToConvert, Json
                        // Logging.Trace ($"scopeT Read: {ex}");
                     }
                 }
+                Logging.Warning ($"{propertyName} = {scope! [propertyName].PropertyValue}");
+
             }
             else
             {
@@ -147,7 +149,7 @@ public override scopeT Read (ref Utf8JsonReader reader, Type typeToConvert, Json
             }
         }
 
-        throw new JsonException ();
+        throw new JsonException ("ScopeJsonConverter");
     }
 
     public override void Write (Utf8JsonWriter writer, scopeT scope, JsonSerializerOptions options)

Terminal.Gui/Drawing/Attribute.cs

@@ -4,6 +4,11 @@
 
 namespace Terminal.Gui;
 
+
+// TODO: Add support for other attributes (bold, underline, etc.) once the platform drivers support them.
+// TODO: See https://github.com/gui-cs/Terminal.Gui/issues/457
+
+
 /// <summary>Attributes represent how text is styled when displayed in the terminal.</summary>
 /// <remarks>
 ///     <see cref="Attribute"/> provides a platform independent representation of colors (and someday other forms of

Terminal.Gui/Drawing/Color/ColorScheme.cs

@@ -4,6 +4,9 @@
 
 namespace Terminal.Gui;
 
+// TODO: Rename "ColorScheme"->"AttributeScheme" given we'll soon have non-color information in Attributes?
+// TODO: See https://github.com/gui-cs/Terminal.Gui/issues/457
+
 /// <summary>Defines a standard set of <see cref="Attribute"/>s for common visible elements in a <see cref="View"/>.</summary>
 /// <remarks>
 ///     <para>

Terminal.Gui/Drawing/Region.cs

@@ -556,72 +556,122 @@ public void Translate (int offsetX, int offsetY)
     /// <returns>A list of merged rectangles.</returns>
     internal static List<Rectangle> MergeRectangles (List<Rectangle> rectangles, bool minimize)
     {
-        if (rectangles.Count == 0)
+        if (rectangles.Count <= 1)
         {
-            return [];
+            return rectangles.ToList ();
         }
 
-        // Sweep-line algorithm to merge rectangles
-        List<(int x, bool isStart, int yTop, int yBottom)> events = new (rectangles.Count * 2); // Pre-allocate
-
+        // Generate events
+        List<(int x, bool isStart, int yTop, int yBottom)> events = new (rectangles.Count * 2);
         foreach (Rectangle r in rectangles)
         {
             if (!r.IsEmpty)
             {
-                events.Add ((r.Left, true, r.Top, r.Bottom)); // Start event
-                events.Add ((r.Right, false, r.Top, r.Bottom)); // End event
+                events.Add ((r.Left, true, r.Top, r.Bottom));
+                events.Add ((r.Right, false, r.Top, r.Bottom));
             }
         }
 
         if (events.Count == 0)
         {
-            return []; // Return empty list if no non-empty rectangles exist
+            return [];
         }
 
+        // Sort events:
+        // 1. Primarily by x-coordinate.
+        // 2. Secondary: End events before Start events at the same x.
+        // 3. Tertiary: By yTop coordinate as a tie-breaker.
+        // 4. Quaternary: By yBottom coordinate as a final tie-breaker.
         events.Sort (
                      (a, b) =>
                      {
+                         // 1. Sort by X
                          int cmp = a.x.CompareTo (b.x);
+                         if (cmp != 0) return cmp;
 
-                         if (cmp != 0)
-                         {
-                             return cmp;
-                         }
+                         // 2. Sort End events before Start events
+                         bool aIsEnd = !a.isStart;
+                         bool bIsEnd = !b.isStart;
+                         cmp = aIsEnd.CompareTo (bIsEnd); // True (End) comes after False (Start)
+                         if (cmp != 0) return -cmp; // Reverse: End (true) should come before Start (false)
 
-                         return a.isStart.CompareTo (b.isStart); // Start events before end events at same x
+                         // 3. Tie-breaker: Sort by yTop
+                         cmp = a.yTop.CompareTo (b.yTop);
+                         if (cmp != 0) return cmp;
+
+                         // 4. Final Tie-breaker: Sort by yBottom
+                         return a.yBottom.CompareTo (b.yBottom);
                      });
 
         List<Rectangle> merged = [];
-
-        SortedSet<(int yTop, int yBottom)> active = new (
-                                                         Comparer<(int yTop, int yBottom)>.Create (
-                                                                                                   (a, b) =>
-                                                                                                   {
-                                                                                                       int cmp = a.yTop.CompareTo (b.yTop);
-
-                                                                                                       return cmp != 0 ? cmp : a.yBottom.CompareTo (b.yBottom);
-                                                                                                   }));
-        int lastX = events [0].x;
-
-        foreach ((int x, bool isStart, int yTop, int yBottom) evt in events)
+        // Use a dictionary to track active intervals and their overlap counts
+        Dictionary<(int yTop, int yBottom), int> activeCounts = new ();
+        // Comparer for sorting intervals when needed
+        var intervalComparer = Comparer<(int yTop, int yBottom)>.Create (
+                                                                         (a, b) =>
+                                                                         {
+                                                                             int cmp = a.yTop.CompareTo (b.yTop);
+                                                                             return cmp != 0 ? cmp : a.yBottom.CompareTo (b.yBottom);
+                                                                         });
+
+        // Helper to get the current active intervals (where count > 0) as a SortedSet
+        SortedSet<(int yTop, int yBottom)> GetActiveIntervals ()
         {
-            // Output rectangles for the previous segment if there are active rectangles
-            if (active.Count > 0 && evt.x > lastX)
+            var set = new SortedSet<(int yTop, int yBottom)> (intervalComparer);
+            foreach (var kvp in activeCounts)
             {
-                merged.AddRange (MergeVerticalIntervals (active, lastX, evt.x));
+                if (kvp.Value > 0)
+                {
+                    set.Add (kvp.Key);
+                }
             }
+            return set;
+        }
+
+        // Group events by x-coordinate to process all events at a given x together
+        var groupedEvents = events.GroupBy (e => e.x).OrderBy (g => g.Key);
+        int lastX = groupedEvents.First ().Key; // Initialize with the first event's x
 
-            // Process the event
-            if (evt.isStart)
+        foreach (var group in groupedEvents)
+        {
+            int currentX = group.Key;
+            // Get active intervals based on state *before* processing events at currentX
+            var currentActiveIntervals = GetActiveIntervals ();
+
+            // 1. Output rectangles for the segment ending *before* this x coordinate
+            if (currentX > lastX && currentActiveIntervals.Count > 0)
             {
-                active.Add ((evt.yTop, evt.yBottom));
+                merged.AddRange (MergeVerticalIntervals (currentActiveIntervals, lastX, currentX));
             }
-            else
+
+            // 2. Process all events *at* this x coordinate to update counts
+            foreach (var evt in group)
             {
-                active.Remove ((evt.yTop, evt.yBottom));
+                var interval = (evt.yTop, evt.yBottom);
+                if (evt.isStart)
+                {
+                    activeCounts.TryGetValue (interval, out int count);
+                    activeCounts [interval] = count + 1;
+                }
+                else
+                {
+                    // Only decrement/remove if the interval exists
+                    if (activeCounts.TryGetValue (interval, out int count))
+                    {
+                        if (count - 1 <= 0)
+                        {
+                            activeCounts.Remove (interval);
+                        }
+                        else
+                        {
+                            activeCounts [interval] = count - 1;
+                        }
+                    }
+                }
             }
 
-            lastX = evt.x;
+            // 3. Update lastX for the next segment
+            lastX = currentX;
         }
 
         return minimize ? MinimizeRectangles (merged) : merged;

Terminal.Gui/Resources/config.json

@@ -52,6 +52,9 @@
         "MessageBox.DefaultButtonAlignment": "Center",
         "MessageBox.DefaultBorderStyle": "Heavy",
         "Button.DefaultShadow": "Opaque",
+        "Menuv2.DefaultBorderStyle": "Single",
+        "MenuBarv2.DefaultBorderStyle": "None",
+        "StatusBar.DefaultSeparatorLineStyle": "Single",
         "ColorSchemes": [
           {
             "TopLevel": {
@@ -316,7 +319,7 @@
         "Glyphs.VLineHvDa3": "┇",
         "Glyphs.VLineHvDa4": "┋"
       }
-    },
+      },
     {
       "Dark": {
         "Dialog.DefaultButtonAlignment": "End",

Terminal.Gui/Terminal.Gui.sln

@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.2.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Terminal.Gui", "Terminal.Gui.csproj", "{79692A4F-7704-552C-0EF5-40B81C4F2E81}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{79692A4F-7704-552C-0EF5-40B81C4F2E81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{79692A4F-7704-552C-0EF5-40B81C4F2E81}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{79692A4F-7704-552C-0EF5-40B81C4F2E81}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{79692A4F-7704-552C-0EF5-40B81C4F2E81}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {4B162456-436F-4899-B765-26C9DBD2991D}
+	EndGlobalSection
+EndGlobal

Terminal.Gui/View/Adornment/Border.cs

@@ -201,6 +201,7 @@ internal Rectangle GetBorderRectangle ()
                    );
     }
 
+    // TODO: Make LineStyle nullable https://github.com/gui-cs/Terminal.Gui/issues/4021
     /// <summary>
     ///     Sets the style of the border by changing the <see cref="Thickness"/>. This is a helper API for setting the
     ///     <see cref="Thickness"/> to <c>(1,1,1,1)</c> and setting the line style of the views that comprise the border. If

Terminal.Gui/View/Adornment/Margin.cs

@@ -104,25 +104,86 @@ public override void BeginInit ()
         ShadowStyle = base.ShadowStyle;
     }
 
-    /// <summary>
-    ///     The color scheme for the Margin. If set to <see langword="null"/> (the default), the margin will be transparent.
-    /// </summary>
-    public override ColorScheme? ColorScheme
+    // TODO: We may actualy need this. Not clear what broke, if anything by commenting it out. See https://github.com/gui-cs/Terminal.Gui/issues/4016
+    /////// <summary>
+    ///////     The color scheme for the Margin. If set to <see langword="null"/> (the default), the margin will be transparent.
+    /////// </summary>
+    //public override ColorScheme? ColorScheme
+    //{
+    //    get
+    //    {
+    //        //if (base.ColorScheme is { })
+    //        {
+    //            return base.ColorScheme;
+    //        }
+
+    //        //return (Parent?.SuperView?.ColorScheme ?? Colors.ColorSchemes ["TopLevel"])!;
+    //    }
+    //    set
+    //    {
+    //        base.ColorScheme = value;
+    //        Parent?.SetNeedsDraw ();
+    //    }
+    //}
+
+    /// <inheritdoc />
+    public override Attribute GetNormalColor ()
     {
-        get
+        if (_colorScheme is { })
         {
-            if (base.ColorScheme is { })
-            {
-                return base.ColorScheme;
-            }
+            return _colorScheme.Normal;
+        }
+        if (Parent is { })
+        {
+            return Parent.GetNormalColor ();
+        }
 
-            return (Parent?.SuperView?.ColorScheme ?? Colors.ColorSchemes ["TopLevel"])!;
+        return base.GetNormalColor ();
+    }
+
+    /// <inheritdoc />
+    public override Attribute GetHotNormalColor ()
+    {
+        if (Parent is { })
+        {
+            return Parent.GetHotNormalColor ();
         }
-        set
+        return base.GetHotNormalColor ();
+    }
+
+    /// <inheritdoc />
+    public override Attribute GetFocusColor ()
+    {
+        if (Parent is { })
         {
-            base.ColorScheme = value;
-            Parent?.SetNeedsDraw ();
+            return Parent.GetFocusColor ();
         }
+        return base.GetFocusColor ();
+    }
+
+    /// <inheritdoc />
+    public override Attribute GetHotFocusColor ()
+    {
+        if (Parent is { })
+        {
+            return Parent.GetHotFocusColor ();
+        }
+
+        return base.GetHotFocusColor ();
+    }
+
+    /// <inheritdoc />
+    protected override bool OnSettingNormalAttribute ()
+    {
+        if (Parent is { })
+        {
+            SetAttribute (Parent.GetNormalColor ());
+
+            return true;
+        }
+
+        return false;
+
     }
 
     /// <inheritdoc/>
@@ -138,6 +199,8 @@ protected override bool OnClearingViewport ()
         // This just draws/clears the thickness, not the insides.
         if (Diagnostics.HasFlag (ViewDiagnosticFlags.Thickness) || base.ColorScheme is { })
         {
+            // TODO: This is a hack. See https://github.com/gui-cs/Terminal.Gui/issues/4016
+            SetAttribute (GetNormalColor ());
             Thickness.Draw (screen, Diagnostics, ToString ());
         }
 

Terminal.Gui/View/Adornment/ShadowView.cs

@@ -54,6 +54,7 @@ protected override bool OnClearingViewport ()
     /// <inheritdoc/>
     protected override bool OnDrawingContent ()
     {
+        SetAttribute (GetNormalColor ());
         switch (ShadowStyle)
         {
             case ShadowStyle.Opaque: