v1.4.4.1 (Blood in the Water Update)

Barotrauma/BarotraumaClient/ClientSource/GUI/GUIComponent.cs

@@ -1,4 +1,4 @@
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System.Collections.Generic;
 using System.Linq;
@@ -734,7 +734,7 @@ namespace Barotrauma
             DrawToolTip(spriteBatch, ToolTip, Rect);
         }
         
-        public static void DrawToolTip(SpriteBatch spriteBatch, RichString toolTip, Vector2 pos)
+        public static void DrawToolTip(SpriteBatch spriteBatch, RichString toolTip, Vector2 pos, Color? textColor = null, Color? backgroundColor = null)
         {
             if (ObjectiveManager.ContentRunning) { return; }
 
@@ -745,6 +745,8 @@ namespace Barotrauma
             if (toolTipBlock == null || (RichString)toolTipBlock.UserData != toolTip)
             {
                 toolTipBlock = new GUITextBlock(new RectTransform(new Point(width, height), null), toolTip, font: GUIStyle.SmallFont, wrap: true, style: "GUIToolTip");
+                if (textColor != null) { toolTipBlock.TextColor = textColor.Value; }
+                if (backgroundColor != null) { toolTipBlock.Color = backgroundColor.Value; }
                 toolTipBlock.RectTransform.NonScaledSize = new Point(
                     (int)(GUIStyle.SmallFont.MeasureString(toolTipBlock.WrappedText).X + padding.X + toolTipBlock.Padding.X + toolTipBlock.Padding.Z),
                     (int)(GUIStyle.SmallFont.MeasureString(toolTipBlock.WrappedText).Y + padding.Y + toolTipBlock.Padding.Y + toolTipBlock.Padding.W));
@@ -754,6 +756,15 @@ namespace Barotrauma
             toolTipBlock.RectTransform.AbsoluteOffset = pos.ToPoint();
             toolTipBlock.SetTextPos();
 
+            if (toolTipBlock.Rect.Right > GameMain.GraphicsWidth - 10)
+            {
+                toolTipBlock.RectTransform.AbsoluteOffset -= new Point(toolTipBlock.Rect.Width,0);
+            }
+            if (toolTipBlock.Rect.Bottom > GameMain.GraphicsHeight - 10)
+            {
+                toolTipBlock.RectTransform.AbsoluteOffset -= new Point(0, toolTipBlock.Rect.Height);
+            }
+
             toolTipBlock.DrawManually(spriteBatch);
         }
 
@@ -982,6 +993,24 @@ namespace Barotrauma
             }
         }
 
+        /// <summary>
+        /// Sets the minimum height of the transfrom to equal to the sum of the minimum heights of the children 
+        /// (i.e. makes the element at least large enough to fit all the children vertically)
+        /// </summary>
+        public void InheritTotalChildrenMinHeight()
+        {
+            RectTransform.InheritTotalChildrenMinHeight();
+        }
+
+        /// <summary>
+        /// Sets the minimum height of the transfrom to equal to the sum of the heights of the children 
+        /// (i.e. makes the element at least large enough to fit all the children vertically)
+        /// </summary>
+        public void InheritTotalChildrenHeight()
+        {
+            RectTransform.InheritTotalChildrenHeight();
+        }
+
         public static GUIComponent FromXML(ContentXElement element, RectTransform parent)
         {
             GUIComponent component = null;