Merge branch 'fix-textbox-bugs' of git://github.com/stefnotch/FlaxEng…

…ine into stefnotch-fix-textbox-bugs
FlaxEngine · Apr 28, 2021 · 3eef855 · 3eef855
2 parents d9f3915 + 3c2c95d
commit 3eef855
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Source/Engine/UI/GUI/Common/TextBoxBase.cs b/Source/Engine/UI/GUI/Common/TextBoxBase.cs
@@ -522,9 +522,7 @@ public virtual void Paste()
             if (string.IsNullOrEmpty(clipboardText))
                 return;
 
-            var right = SelectionRight;
             Insert(clipboardText);
-            SetSelection(Mathf.Max(right, 0) + clipboardText.Length);
         }
 
         /// <summary>
@@ -640,11 +638,13 @@ public virtual void Insert(string str)
             {
                 var left = SelectionLeft >= 0 ? SelectionLeft : 0;
                 if (HasSelection)
+                {
                     _text = _text.Remove(left, selectionLength);
-
+                    SetSelection(left);
+                }
                 _text = _text.Insert(left, str);
 
-                SetSelection(left + 1);
+                SetSelection(left + str.Length);
             }
 
             OnTextChanged();