Unstable 0.16.0.0

2022-01-14 01:28:24 +09:00
parent d9baeaa2e1
commit 7d6421a548
237 changed files with 6430 additions and 2205 deletions
@@ -204,6 +204,12 @@ namespace Barotrauma
            set { textColor = value; }
        }

+        public Color DisabledTextColor
+        {
+            get => disabledTextColor;
+            set => disabledTextColor = value;
+        }
+
        private Color? hoverTextColor;
        public Color HoverTextColor
        {
@@ -303,6 +309,10 @@ namespace Barotrauma
            if (parseRichText)
            {
                RichTextData = Barotrauma.RichTextData.GetRichTextData(text, out text);
+                if (RichTextData != null && RichTextData.Count == 0)
+                {
+                    RichTextData = null;
+                }
            }

            //if the text is in chinese/korean/japanese and we're not using a CJK-compatible font,
@@ -457,7 +467,7 @@ namespace Barotrauma
            while (size == Vector2.Zero)
            {
                try { size = Font.MeasureString(string.IsNullOrEmpty(text) ? " " : text); }
-                catch { text = text.Substring(0, text.Length - 1); }
+                catch { text = text.Length > 0 ? text.Substring(0, text.Length - 1) : ""; }
            }

            return size;