From 5c906f6c7f9c01acfdea34b32b4b98d7c7e20d20 Mon Sep 17 00:00:00 2001 From: Jamie Cameron Date: Fri, 27 Jun 2008 12:48:04 +0000 Subject: [PATCH] Fix highlighting of found text --- file/FileManager.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/file/FileManager.java b/file/FileManager.java index f882cc732..a1678efa5 100644 --- a/file/FileManager.java +++ b/file/FileManager.java @@ -1719,6 +1719,7 @@ class GotoWindow extends FixedFrame implements CbButtonCallback // Found the line! editor.edit.select(c, c); dispose(); + editor.edit.requestFocus(); return; } } @@ -1804,10 +1805,16 @@ class FindReplaceWindow extends FixedFrame implements CbButtonCallback // the cursor + 1, and select it int pos = edittxt.indexOf(findtxt, editor.edit.getSelectionStart()+1); + if (pos < 0) { + // Not found .. but try wrap-around + pos = edittxt.indexOf(findtxt, 0); + } if (pos < 0) new ErrorWindow(filemgr.text("edit_notfound", findtxt)); - else + else { editor.edit.select(pos, pos+findtxt.length()); + editor.edit.requestFocus(); + } } else if (b == replace_b) { // If the word to search for is selected, replace it. Otherwise