Skip to content

Commit 57dae2b

Browse files
committed
Merge pull request #186 from jphalip/master
Fix for search field's caret position
2 parents 18376bb + 7728be7 commit 57dae2b

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

SearchWebView.m

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,16 @@ - (void)updateSearch:(NSSearchField *)sender
7979

8080
DOMRange *selection;
8181

82+
// Back-up the search field's caret position so we can restore it later
83+
NSRange searchFieldSelectedRange = [[sender currentEditor] selectedRange];
84+
8285
if([searchString length]>0){
8386
selection=[self highlightAllOccurencesOfString:searchString];
87+
88+
// Bring the search field back in focus and restore its caret position
8489
[[sender window] makeFirstResponder:sender];
90+
[[sender currentEditor] setSelectedRange:searchFieldSelectedRange];
91+
8592
if(selection!=nil)
8693
[self setSelectedDOMRange:selection affinity:NSSelectionAffinityDownstream];
8794
}else{

0 commit comments

Comments
 (0)