(683b11c00) High-res shuttle preview images + merge fix

Barotrauma/BarotraumaClient/Source/GUI/GUIComponent.cs

@@ -483,7 +483,6 @@ namespace Barotrauma
                     (int)(GUI.SmallFont.MeasureString(toolTipBlock.WrappedText).Y + padding.Y));
                 toolTipBlock.userData = toolTip;
             }
-            toolTipBlock.SetTextPos();
 
             toolTipBlock.RectTransform.AbsoluteOffset = new Point(targetElement.Center.X, targetElement.Bottom);
             if (toolTipBlock.Rect.Right > GameMain.GraphicsWidth - 10)
@@ -564,7 +563,6 @@ namespace Barotrauma
             RectTransform.LocalScale = startScale;
             yield return CoroutineStatus.Success;
         }
-        #endregion
 
         public virtual void ApplyStyle(GUIComponentStyle style)
         {

Barotrauma/BarotraumaClient/Source/GUI/GUIMessageBox.cs

@@ -60,7 +60,7 @@ namespace Barotrauma
             GUI.Style.Apply(Header, "", this);
             Header.RectTransform.MinSize = new Point(0, Header.Rect.Height);
 
-            if (height == 0)
+            if (!string.IsNullOrWhiteSpace(text))
             {
                 Text = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), Content.RectTransform), 
                     text, textAlignment: textAlignment, wrap: true);