Cleanup textbox a bit

jsebold666 · Feb 7, 2024 · a97013f · a97013f
1 parent 6856d1d
commit a97013f
Showing 1 changed file with 6 additions and 29 deletions.
diff --git a/src/ClassicUO.Client/Game/UI/Controls/TextBox.cs b/src/ClassicUO.Client/Game/UI/Controls/TextBox.cs
@@ -71,36 +71,8 @@ public TextBox
             bool supportsCommands = true,
             bool ignoreColorCommands = false,
             bool calculateGlyphs = false
-        )
-        {
-            if (strokeEffect)
-                text = $"/es[{getStrokeSize}]" + text;
-
-            _rtl = new RichTextLayout
-            {
-                Font = TrueTypeLoader.Instance.GetFont(font, size),
-                Text = text,
-                IgnoreColorCommand = ignoreColorCommands,
-                SupportsCommands = supportsCommands,
-                CalculateGlyphs = calculateGlyphs
-            };
-
-            if (width != null)
-                _rtl.Width = width;
+        ) : this(text, font, size, width, ConvertHueToColor(hue), align, strokeEffect, supportsCommands, ignoreColorCommands, calculateGlyphs) { }
 
-            _font = font;
-            _size = size;
-            _color.PackedValue = HuesLoader.Instance.GetHueColorRgba8888(31, (ushort)hue);
-
-            if (hue == 0xFFFF || hue == ushort.MaxValue)
-                _color = Color.White;
-
-            _align = align;
-
-            AcceptMouseInput = true;
-            Width = _rtl.Width == null ? _rtl.Size.X : (int)_rtl.Width;
-            base.Height = _rtl.Size.Y;
-        }
         public TextBox
             (
                 string text,
@@ -140,6 +112,11 @@ public TextBox
             base.Height = _rtl.Size.Y;
         }
 
+        public static Color ConvertHueToColor(int hue)
+        {
+            return new Color() { PackedValue = HuesLoader.Instance.GetHueColorRgba8888(31, (ushort)hue) };
+        }
+
         public bool PixelCheck(int x, int y)
         {
             if (!AcceptMouseInput || string.IsNullOrWhiteSpace(Text))