Unstable 0.17.1.0

2022-03-17 01:25:04 +09:00
parent 3974067915
commit 6d410cc1b7
302 changed files with 5878 additions and 3317 deletions
@@ -96,11 +96,15 @@ namespace Barotrauma
                    switch (child.ScaleBasis)
                    {
                        case ScaleBasis.BothHeight:
+                            child.MinSize = new Point(child.Rect.Height, child.MinSize.Y);
+                            break;
                        case ScaleBasis.Smallest when Rect.Height <= Rect.Width:
                        case ScaleBasis.Largest when Rect.Height > Rect.Width:
                            child.MinSize = new Point((int)((child.Rect.Height * child.RelativeSize.X) / child.RelativeSize.Y), child.MinSize.Y);
                            break;
                        case ScaleBasis.BothWidth:
+                            child.MinSize = new Point(child.MinSize.X, child.Rect.Width);
+                            break;
                        case ScaleBasis.Smallest when Rect.Width <= Rect.Height:
                        case ScaleBasis.Largest when Rect.Width > Rect.Height:
                            child.MinSize = new Point(child.MinSize.X, (int)((child.Rect.Width * child.RelativeSize.Y) / child.RelativeSize.X));