fix font size in ComboBox/TabControl

Author: pandinocoder

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

@@ -45,6 +45,7 @@ public ComboBox(Base parent, string? name = default) : base(parent, name)
         Size = new Point(100, 20);
         _menu = new Menu(this, name: nameof(_menu))
         {
+            FontProvider = this,
             IsHidden = true,
             IconMarginDisabled = true,
             IsTabable = false,

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

@@ -0,0 +1,10 @@
+using Intersect.Client.Framework.Graphics;
+
+namespace Intersect.Client.Framework.Gwen.Control;
+
+public interface IFontProvider
+{
+    IFont? Font { get; set; }
+
+    int FontSize { get; set; }
+}

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

@@ -15,7 +15,7 @@ namespace Intersect.Client.Framework.Gwen.Control;
 /// <summary>
 ///     Static text label.
 /// </summary>
-public partial class Label : Base, ILabel
+public partial class Label : Base, ILabel, IFontProvider
 {
     protected readonly Text _textElement;
 

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

@@ -42,6 +42,21 @@ public Menu(Base parent, string? name = default) : base(parent, name)
 
     #region Font Handling
 
+    public IFontProvider? FontProvider
+    {
+        get => _fontProvider;
+        set
+        {
+            if (value == _fontProvider)
+            {
+                return;
+            }
+
+            _fontProvider = value;
+            UpdateItemStyles();
+        }
+    }
+
     private IFont? _itemFont;
 
     public IFont? ItemFont
@@ -59,6 +74,7 @@ public string? ItemFontName
     }
 
     private int _itemFontSize;
+    private IFontProvider? _fontProvider;
 
     public int ItemFontSize
     {
@@ -478,15 +494,25 @@ public override void LoadJson(JToken token, bool isRoot = default)
 
     private void UpdateItemStyles()
     {
+        var font = _fontProvider?.Font;
+        var itemFontSize = (_itemFontSize < 1 ? 10 : _itemFontSize);
+        var fontSize = _fontProvider?.FontSize ?? itemFontSize;
+
+        if (_itemFont is { } itemFont)
+        {
+            font = itemFont;
+            fontSize = itemFontSize;
+        }
+
         var menuItems = Children.OfType<MenuItem>().ToArray();
         foreach (var item in menuItems)
         {
-            if (_itemFont != null)
+            if (font != null)
             {
-                item.Font = _itemFont;
+                item.Font = font;
             }
 
-            item.FontSize = _itemFontSize;
+            item.FontSize = fontSize;
             item.SetTextColor(mItemNormalTextColor, ComponentState.Normal);
             item.SetTextColor(mItemHoverTextColor, ComponentState.Hovered);
         }

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

@@ -1,5 +1,7 @@
-using Intersect.Client.Framework.Graphics;
+using Intersect.Client.Framework.File_Management;
+using Intersect.Client.Framework.Graphics;
 using Intersect.Client.Framework.Gwen.ControlInternal;
+using Newtonsoft.Json.Linq;
 
 namespace Intersect.Client.Framework.Gwen.Control;
 
@@ -121,6 +123,7 @@ public IFont? Font
             foreach (var tab in tabs)
             {
                 tab.Font = _font;
+                tab.FontSize = _fontSize;
             }
         }
     }
@@ -155,6 +158,7 @@ public TabButton AddPage(string label, string? tabName, Base? page = null)
         TabButton button = new(_tabStrip)
         {
             Font = _font,
+            FontSize = _fontSize,
             IsTabable = false,
             Page = page,
             Text = label,
@@ -211,6 +215,40 @@ public TabButton AddPage(TabButton button)
         return button;
     }
 
+    public override JObject? GetJson(bool isRoot = false, bool onlySerializeIfNotEmpty = false)
+    {
+        var serializedProperties = base.GetJson(isRoot, onlySerializeIfNotEmpty);
+        if (serializedProperties is null)
+        {
+            return null;
+        }
+
+        serializedProperties[nameof(Font)] = Font?.Name;
+        serializedProperties[nameof(FontSize)] = FontSize;
+
+        return serializedProperties;
+    }
+
+    public override void LoadJson(JToken token, bool isRoot = default)
+    {
+        base.LoadJson(token, isRoot);
+
+        if (token is not JObject obj)
+        {
+            return;
+        }
+
+        if (obj.TryGetValue(nameof(Font), out var tokenFont) && tokenFont is { Type: JTokenType.String })
+        {
+            Font = GameContentManager.Current.GetFont(tokenFont.Value<string>());
+        }
+
+        if (obj.TryGetValue(nameof(FontSize), out var tokenFontSize) && tokenFontSize is { Type: JTokenType.Integer })
+        {
+            FontSize = tokenFontSize.Value<int>();
+        }
+    }
+
     /// <summary>
     ///     Handler for tab selection.
     /// </summary>