(a410fd46c) Trying to help the merge script through a jungle of merges

2019-06-04 16:19:53 +03:00
parent 5208b922d8
commit bea7b58ff3
84 changed files with 1720 additions and 929 deletions
@@ -85,7 +85,9 @@ namespace Barotrauma
            {
                float totalSize = RectTransform.Children
                    .Where(c => !c.GUIComponent.IgnoreLayoutGroups)
-                    .Sum(c => isHorizontal ? c.Rect.Width : c.Rect.Height);
+                    .Sum(c => isHorizontal ? 
+                        MathHelper.Clamp(c.Rect.Width, c.MinSize.X, c.MaxSize.X) :
+                        MathHelper.Clamp(c.Rect.Height, c.MinSize.Y, c.MaxSize.Y));

                totalSize += 
                    (RectTransform.Children.Count() - 1) *