(372c6e60a) More automatic text scaling + merge fix

2019-05-06 14:14:30 +03:00
parent 7d825b051c
commit 5af8170ac6
20 changed files with 21 additions and 630 deletions
@@ -60,7 +60,10 @@ namespace Barotrauma
            var infoHolder = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.5f), leftColumn.RectTransform)) { RelativeSpacing = 0.05f };

            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.3f), infoHolder.RectTransform, Anchor.Center), TextManager.Get("JoinServer"), font: GUI.LargeFont)
-            { ForceUpperCase = true };
+            {
+                ForceUpperCase = true,
+                AutoScale = true
+            };

            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), infoHolder.RectTransform), TextManager.Get("YourName"));
            clientNameBox = new GUITextBox(new RectTransform(new Vector2(1.0f, 0.13f), infoHolder.RectTransform), "")