fix: don't use TextColorOverride (#2044)

Intersect.Client.Framework/Gwen/Control/WindowControl.cs

@@ -33,19 +33,19 @@ public enum ControlState
 
         private readonly Dragger mTitleBar;
 
-        private Color mActiveColor;
+        private Color? mActiveColor;
 
-        private GameTexture mActiveImage;
+        private Color? mInactiveColor;
 
-        private string mActiveImageFilename;
+        private GameTexture? mActiveImage;
 
-        private bool mDeleteOnClose;
+        private GameTexture? mInactiveImage;
 
-        private Color mInactiveColor;
+        private string? mActiveImageFilename;
 
-        private GameTexture mInactiveImage;
+        private string? mInactiveImageFilename;
 
-        private string mInactiveImageFilename;
+        private bool mDeleteOnClose;
 
         private Modal mModal;
 
@@ -315,23 +315,15 @@ public void RemoveModal()
         protected override void Render(Skin.Base skin)
         {
             var hasFocus = IsOnTop;
-            var clr = GetTextColor(ControlState.Active);
-            if (clr == null && !hasFocus)
+            var textColor = GetTextColor(ControlState.Active);
+            if (textColor == null && !hasFocus)
             {
-                clr = GetTextColor(ControlState.Inactive);
+                textColor = GetTextColor(ControlState.Inactive);
             }
 
-            //if (clr == null && hasFocus)
-            //{
-            //    clr = Skin.Colors.Window.TitleActive;
-            //}
+            textColor ??= Skin.Colors.Window.TitleInactive;
 
-            if (clr == null)
-            {
-                clr = Skin.Colors.Window.TitleInactive;
-            }
-
-            mTitle.TextColor = clr;
+            mTitle.TextColor = textColor;
 
             skin.DrawWindow(this, mTitleBar.Bottom, hasFocus);
         }
@@ -404,19 +396,14 @@ public void SetTextColor(Color clr, ControlState state)
             }
         }
 
-        public Color GetTextColor(ControlState state)
+        public Color? GetTextColor(ControlState state)
         {
-            switch (state)
+            return state switch
             {
-                case ControlState.Active:
-                    return mActiveColor;
-
-                case ControlState.Inactive:
-                    return mInactiveColor;
-
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(state), state, null);
-            }
+                ControlState.Active => mActiveColor,
+                ControlState.Inactive => mInactiveColor,
+                _ => throw new ArgumentOutOfRangeException(nameof(state), state, $"Invalid {nameof(ControlState)}"),
+            };
         }
 
         /// <summary>