Unstable v0.19.3.0

2022-09-02 15:10:56 -03:00
parent 28789616bd
commit 3f2c843247
336 changed files with 7152 additions and 7739 deletions
@@ -141,7 +141,23 @@ namespace Barotrauma
        public readonly static GUIColor HealthBarColorMedium = new GUIColor("HealthBarColorMedium");
        public readonly static GUIColor HealthBarColorHigh = new GUIColor("HealthBarColorHigh");

-        public static Point ItemFrameMargin => new Point(50, 56).Multiply(GUI.SlicedSpriteScale);
+        public static Point ItemFrameMargin 
+        {
+            get 
+            { 
+                Point size = new Point(50, 56).Multiply(GUI.SlicedSpriteScale);
+
+                var style = GetComponentStyle("ItemUI"); 
+                var sprite = style?.Sprites[GUIComponent.ComponentState.None].First();
+                if (sprite != null)
+                {
+                    size.X = Math.Min(sprite.Slices[0].Width + sprite.Slices[2].Width, size.X);
+                    size.Y = Math.Min(sprite.Slices[0].Height + sprite.Slices[6].Height, size.Y);
+                }
+                return size;
+            } 
+        }
+
        public static Point ItemFrameOffset => new Point(0, 3).Multiply(GUI.SlicedSpriteScale);

        public static GUIComponentStyle GetComponentStyle(string name)