Merge pull request #6485 from 424ever/textbox-drag-crash

Fix crash when dragging in a text box while a key is held down
ppy · Jan 6, 2025 · e05cb86 · e05cb86
2 parents 0a16e77 + 635ce03
commit e05cb86
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneTextBox.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneTextBox.cs
@@ -800,6 +800,40 @@ public void TestSetTextSelection()
             AddAssert("nothing selected", () => textBox.SelectedText == string.Empty);
         }
 
+        [Test]
+        public void TestTextChangedDuringDoubleClickDrag()
+        {
+            InsertableTextBox textBox = null;
+
+            AddStep("add textbox", () =>
+            {
+                textBoxes.Add(textBox = new InsertableTextBox
+                {
+                    Size = new Vector2(300, 40),
+                    Text = "initial text",
+                });
+            });
+
+            AddStep("click on textbox", () =>
+            {
+                InputManager.MoveMouseTo(textBox);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddStep("set text", () => textBox.Text = "aaaaaaaaaaaaaaaaaaaa");
+
+            AddStep("select word", () =>
+            {
+                InputManager.Click(MouseButton.Left);
+                InputManager.PressButton(MouseButton.Left);
+            });
+
+            AddStep("insert text", () => textBox.InsertString("a"));
+            AddAssert("text overwritten", () => textBox.Text == "a");
+            AddStep("start drag", () => InputManager.MoveMouseTo(textBox, new Vector2(-50, 0)));
+            AddStep("end drag", () => InputManager.ReleaseButton(MouseButton.Left));
+        }
+
         [Test]
         public void TestSelectAll()
         {

diff --git a/osu.Framework/Graphics/UserInterface/TextBox.cs b/osu.Framework/Graphics/UserInterface/TextBox.cs
@@ -773,6 +773,7 @@ private string removeCharacters(int number = 1)
                 TextFlow.ChangeChildDepth(TextFlow[i], getDepthForCharacterIndex(i));
 
             selectionStart = selectionEnd = removeStart;
+            doubleClickWord = null;
 
             endTextChange(beganChange);
             cursorAndLayout.Invalidate();