Merge pull request #11579 from mjuhasz/fix/find-highlight-plain-textbox

niksedk · web-flow · commit 00e7476c8b4d · 2026-06-13T11:13:17.000-04:00
Fix find highlight and Find Next not advancing (plain text box mode)
diff --git a/src/ui/Features/Main/MainViewModel.cs b/src/ui/Features/Main/MainViewModel.cs
@@ -9712,7 +9712,7 @@ private async Task FindNext()
 
         var subs = Subtitles.Select(p => p.Text).ToList();
         var currentLineIndex = Subtitles.IndexOf(selectedSubtitle);
-        var currentCharIndex = EditTextBox.CaretIndex;
+        var currentCharIndex = EditTextBox.SelectionEnd;
         var idx = _findService.FindNext(_findService.SearchText, subs, currentLineIndex, currentCharIndex);
 
         if (idx < 0)
diff --git a/src/ui/Features/Shared/TextBoxUtils/TextBoxWrapper.cs b/src/ui/Features/Shared/TextBoxUtils/TextBoxWrapper.cs
@@ -53,7 +53,6 @@ public void Select(int start, int length)
     {
         _textBox.SelectionStart = start;
         _textBox.SelectionEnd = start + length;
-        _textBox.CaretIndex = start + length;
     }
 
     public int CaretIndex

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,6 @@ public void Select(int start, int length)`
`53`	`53`	`{`
`54`	`54`	`_textBox.SelectionStart = start;`
`55`	`55`	`_textBox.SelectionEnd = start + length;`
`56`		`- _textBox.CaretIndex = start + length;`
`57`	`56`	`}`
`58`	`57`
`59`	`58`	`public int CaretIndex`