(e42047dc1) Tester's build, January 30th 2020

2020-01-30 15:56:31 -03:00
parent eaa18a20a3
commit 15499cb704
203 changed files with 8274 additions and 4950 deletions
@@ -117,7 +117,24 @@ namespace Barotrauma.Items.Components
            else
            {
                //if a GUIFrame has been defined, draw the inventory inside it
-                guiCustomComponent = new GUICustomComponent(new RectTransform(new Vector2(0.9f), GuiFrame.RectTransform, Anchor.Center),
+
+                var content = new GUIFrame(new RectTransform(GuiFrame.Rect.Size - GUIStyle.ItemFrameMargin, GuiFrame.RectTransform, Anchor.Center) { AbsoluteOffset = GUIStyle.ItemFrameOffset },
+                    style: null)
+                {
+                    CanBeFocused = false
+                };
+
+                string labelText = GetUILabel();
+                GUITextBlock label = null;
+                if (!string.IsNullOrEmpty(labelText))
+                {
+                    label = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), content.RectTransform, Anchor.TopCenter), 
+                        labelText, font: GUI.SubHeadingFont, textAlignment: Alignment.Center, wrap: true);
+                }
+
+                float minInventoryAreaSize = 0.5f;
+                guiCustomComponent = new GUICustomComponent(
+                    new RectTransform(new Vector2(1.0f, label == null ? 1.0f : Math.Max(1.0f - label.RectTransform.RelativeSize.Y, minInventoryAreaSize)), content.RectTransform, Anchor.BottomCenter),
                    onDraw: (SpriteBatch spriteBatch, GUICustomComponent component) => { Inventory.Draw(spriteBatch); },
                    onUpdate: null)
                {
@@ -127,6 +144,19 @@ namespace Barotrauma.Items.Components
            }
        }

+        public string GetUILabel()
+        {
+            if (UILabel == string.Empty) { return string.Empty; }
+            if (UILabel != null)
+            {
+                return TextManager.Get("UILabel." + UILabel);
+            }
+            else
+            {
+                return item?.Name;
+            }            
+        }
+
        public void Draw(SpriteBatch spriteBatch, bool editing = false, float itemDepth = -1)
        {
            if (hideItems || (item.body != null && !item.body.Enabled)) { return; }