(fdc49c8c) Unstable 0.9.7.1

2020-02-29 14:45:16 -03:00
parent 27e10f7c2e
commit c81486a993
74 changed files with 666 additions and 468 deletions
@@ -171,6 +171,14 @@ namespace Barotrauma
                TextBlock.SetTextPos();
            }
            GUI.Style.Apply(textBlock, "", this);
+
+            //if the text is in chinese/korean/japanese and we're not using a CJK-compatible font,
+            //use the default CJK font as a fallback
+            if (TextManager.IsCJK(textBlock.Text) && !textBlock.Font.IsCJK)
+            {
+                textBlock.Font = GUI.CJKFont;
+            }
+
            Enabled = true;
        }