(26639256a) - Added a method that automatically sets the text scale of a set of GUITextBlocks so that they all use the same scale and the text fits in all of the blocks. - Fixed TextBlock padding not being taken into account if the text is centered. - AutoScale and change the layout in a bunch of places where translated texts are likely to not fit.

Barotrauma/BarotraumaClient/Source/GUI/GUITextBlock.cs

@@ -1,6 +1,8 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Barotrauma
 {
@@ -247,7 +249,7 @@ namespace Barotrauma
                 return;
             }
 
-            textPos = new Vector2(rect.Width / 2.0f, rect.Height / 2.0f);
+            textPos = new Vector2(padding.X + (rect.Width - padding.Z - padding.X) / 2.0f, padding.Y + (rect.Height - padding.Y - padding.W) / 2.0f);
             origin = TextSize * 0.5f;
 
             if (textAlignment.HasFlag(Alignment.Left) && !overflowClipActive)
@@ -338,5 +340,25 @@ namespace Barotrauma
 
             if (OutlineColor.A * currColor.A > 0.0f) GUI.DrawRectangle(spriteBatch, rect, OutlineColor * (currColor.A / 255.0f), false);
         }
+
+        /// <summary>
+        /// Set the text scale of the GUITextBlocks so that they all use the same scale and can fit the text within the block.
+        /// </summary>
+        public static void AutoScaleAndNormalize(IEnumerable<GUITextBlock> textBlocks)
+        {
+            if (!textBlocks.Any()) { return; }
+            float minScale = textBlocks.First().TextScale;
+            foreach (GUITextBlock textBlock in textBlocks)
+            {
+                textBlock.AutoScale = true;
+                minScale = Math.Min(textBlock.TextScale, minScale);
+            }
+
+            foreach (GUITextBlock textBlock in textBlocks)
+            {
+                textBlock.AutoScale = false;
+                textBlock.TextScale = minScale;
+            }
+        }
     }
 }

Barotrauma/BarotraumaClient/Source/GUI/GUITickBox.cs

@@ -76,6 +76,11 @@ namespace Barotrauma
             get { return box; }
         }
 
+        public GUITextBlock TextBlock
+        {
+            get { return text; }
+        }
+
         public override string ToolTip
         {
             get { return base.ToolTip; }
@@ -123,6 +128,7 @@ namespace Barotrauma
         private void ResizeBox()
         {
             box.RectTransform.NonScaledSize = new Point(RectTransform.NonScaledSize.Y);
+            text.RectTransform.NonScaledSize = new Point(Rect.Width - box.Rect.Width, text.Rect.Height);
             text.RectTransform.AbsoluteOffset = new Point(box.Rect.Width, 0);
         }