(1762f02b3) Merge branch 'dev' into human-ai

Barotrauma/BarotraumaClient/Source/GUI/GUITextBox.cs

@@ -123,6 +123,12 @@ namespace Barotrauma
             }
         }
 
+        public bool OverflowClip
+        {
+            get { return textBlock.OverflowClip; }
+            set { textBlock.OverflowClip = value; }
+        }
+
         public override bool Enabled
         {
             get { return enabled; }
@@ -318,7 +324,7 @@ namespace Barotrauma
                 for (int i = 0; i <= textBlock.Text.Length; i++)
                 {
                     Vector2 textSize = Font.MeasureString(textBlock.Text.Substring(0, i));
-                    Vector2 indexPos = new Vector2(textSize.X + textBlock.Padding.X, textSize.Y + textBlock.Padding.Y);
+                    Vector2 indexPos = new Vector2(textSize.X + textBlock.Padding.X, textSize.Y + textBlock.Padding.Y) + textBlock.TextPos - textBlock.Origin;
                     //DebugConsole.NewMessage($"index: {i}, pos: {indexPos}", Color.WhiteSmoke);
                     positions.Add(new Tuple<Vector2, int>(textBlock.Rect.Location.ToVector2() + indexPos, i));
                 }
@@ -405,7 +411,7 @@ namespace Barotrauma
             {
                 isSelecting = PlayerInput.KeyDown(Keys.LeftShift) || PlayerInput.KeyDown(Keys.RightShift);
             }
-            
+
             if (CaretEnabled)
             {
                 if (textBlock.OverflowClipActive)
@@ -428,7 +434,7 @@ namespace Barotrauma
                     CalculateCaretPos();
                 }
             }
-            
+
             if (GUI.KeyboardDispatcher.Subscriber == this)
             {
                 state = ComponentState.Selected;
@@ -547,15 +553,7 @@ namespace Barotrauma
 
         public void ReceiveTextInput(char inputChar)
         {
-            if (selectedCharacters > 0)
-            {
-                RemoveSelectedText();
-            }
-            if (SetText(Text.Insert(CaretIndex, inputChar.ToString())))
-            {
-                CaretIndex = Math.Min(Text.Length, CaretIndex + 1);
-                OnTextChanged?.Invoke(this, Text);
-            }
+            ReceiveTextInput(inputChar.ToString());
         }
 
         public void ReceiveTextInput(string input)
@@ -564,10 +562,16 @@ namespace Barotrauma
             {
                 RemoveSelectedText();
             }
+            Vector2 textPos = textBlock.TextPos;
+            bool wasOverflowClipActive = textBlock.OverflowClipActive;
             if (SetText(Text.Insert(CaretIndex, input)))
             {
                 CaretIndex = Math.Min(Text.Length, CaretIndex + input.Length);
                 OnTextChanged?.Invoke(this, Text);
+                if (textBlock.OverflowClipActive && wasOverflowClipActive && !MathUtils.NearlyEqual(textBlock.TextPos, textPos))
+                {
+                    textBlock.TextPos = textPos + Vector2.UnitX * Font.MeasureString(input).X;
+                }
             }
         }