(3dc4135ce) v0.9.5.1

2019-11-21 18:22:25 +01:00
parent b39922a074
commit 5c95c53118
287 changed files with 12655 additions and 5048 deletions
@@ -119,6 +119,19 @@ namespace Barotrauma
            }
        }

+        public override ScalableFont Font
+        {
+            get
+            {
+                return base.Font;
+            }
+            set
+            {
+                base.Font = value;
+                if (TextBox != null) { TextBox.Font = value; }
+            }
+        }
+
        public GUILayoutGroup LayoutGroup
        {
            get;
@@ -147,11 +160,11 @@ namespace Barotrauma
            };
            TextBox.OnTextChanged += TextChanged;
            var buttonArea = new GUIFrame(new RectTransform(new Vector2(_relativeButtonAreaWidth, 1.0f), LayoutGroup.RectTransform, Anchor.CenterRight), style: null);
-            if (!relativeButtonAreaWidth.HasValue)
+            /*if (!relativeButtonAreaWidth.HasValue)
            {
                // Not sure what's the point of this
                buttonArea.RectTransform.MinSize = new Point(Rect.Height, 0);
-            }
+            }*/
            PlusButton = new GUIButton(new RectTransform(new Vector2(1.0f, 0.5f), buttonArea.RectTransform), "+");
            PlusButton.OnButtonDown += () =>
            {