From e4024a5fc3a9fce13475b6b014ca8e842b035dcf Mon Sep 17 00:00:00 2001
From: Brandon Thetford <github@snapsinazfs.com>
Date: Thu, 15 Feb 2024 19:06:48 -0700
Subject: [PATCH] Simplify the type initializer and Reset method

---
 Terminal.Gui/Drawing/ColorScheme.Colors.cs | 24 ++++++++--------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/Terminal.Gui/Drawing/ColorScheme.Colors.cs b/Terminal.Gui/Drawing/ColorScheme.Colors.cs
index 53eb9492c..57dd4ad27 100644
--- a/Terminal.Gui/Drawing/ColorScheme.Colors.cs
+++ b/Terminal.Gui/Drawing/ColorScheme.Colors.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Globalization;
+#nullable enable
 using System.Text.Json.Serialization;
 
 namespace Terminal.Gui;
@@ -12,6 +11,7 @@ public static class Colors
 {
     static Colors ()
     {
+        ColorSchemes = new (5, StringComparer.InvariantCultureIgnoreCase);
         Reset ();
     }
 
@@ -61,25 +61,17 @@ public static class Colors
     /// </remarks>
     [SerializableConfigurationProperty (Scope = typeof (ThemeScope), OmitClassName = true)]
     [JsonConverter (typeof (DictionaryJsonConverter<ColorScheme>))]
-    public static Dictionary<string, ColorScheme>
-        ColorSchemes { get; private set; } // Serialization requires this to have a setter (private set;)
+    public static Dictionary<string, ColorScheme> ColorSchemes { get; private set; }
 
     /// <summary>Resets the <see cref="ColorSchemes"/> dictionary to the default values.</summary>
     public static Dictionary<string, ColorScheme> Reset ()
     {
-        ColorSchemes ??= new Dictionary<string, ColorScheme> (
-                                                              5,
-                                                              CultureInfo.InvariantCulture.CompareInfo
-                                                                         .GetStringComparer (
-                                                                                             CompareOptions.IgnoreCase
-                                                                                            )
-                                                             );
         ColorSchemes.Clear ();
-        ColorSchemes.Add ("TopLevel", new ColorScheme ());
-        ColorSchemes.Add ("Base", new ColorScheme ());
-        ColorSchemes.Add ("Dialog", new ColorScheme ());
-        ColorSchemes.Add ("Menu", new ColorScheme ());
-        ColorSchemes.Add ("Error", new ColorScheme ());
+        ColorSchemes.Add ("TopLevel", new ());
+        ColorSchemes.Add ("Base", new ());
+        ColorSchemes.Add ("Dialog", new ());
+        ColorSchemes.Add ("Menu", new ());
+        ColorSchemes.Add ("Error", new ());
 
         return ColorSchemes;
     }