(048b753e6) Merge branch 'dev' into human-ai

2019-05-16 05:20:29 +03:00
parent 7b6c2f1fa8
commit 3d7a113d75
47 changed files with 651 additions and 461 deletions
@@ -57,14 +57,17 @@ namespace Barotrauma
            }
        }

-        public override string ToolTip
+        public override ScalableFont Font
        {
-            get { return base.ToolTip; }
+            get
+            {
+                return base.Font;
+            }
+
            set
            {
-                base.ToolTip = value;
-                box.ToolTip = value;
-                text.ToolTip = value;
+                base.Font = value;
+                if (text != null) text.Font = value;
            }
        }

@@ -73,6 +76,11 @@ namespace Barotrauma
            get { return box; }
        }

+        public GUITextBlock TextBlock
+        {
+            get { return text; }
+        }
+
        public override string ToolTip
        {
            get { return base.ToolTip; }
@@ -120,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);
        }