(345ac3e2d) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-05-16 05:59:40 +03:00
parent 018f20e0f0
commit 79e38a0fa0
16 changed files with 314 additions and 146 deletions
@@ -33,6 +33,7 @@ namespace Barotrauma
        public GUIMessageBox(string headerText, string text, string[] buttons, Vector2? relativeSize = null, Point? minSize = null, Alignment textAlignment = Alignment.TopLeft, string tag = "")
            : base(new RectTransform(Vector2.One, GUI.Canvas, Anchor.Center), style: "")
        {
+            //int width = (int)(DefaultWidth * GUI.Scale), height = 0;
            int width = DefaultWidth, height = 0;
            if (relativeSize.HasValue)
            {