Merge pull request #95 from dzmipt/finosSearchBugs

Select find text (issue #91) and Fix Find Back (issue #93)
dzmipt · Mar 23, 2022 · 3f8f64e · 3f8f64e
2 parents 3a18cb6 + 611f3fe
commit 3f8f64e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/studio/ui/SearchPanel.java b/src/main/studio/ui/SearchPanel.java
@@ -112,6 +112,7 @@ public void setReplaceVisible(boolean visible) {
     public void setVisible(boolean visible) {
         super.setVisible(visible);
         if (visible) {
+            txtFind.selectAll();
             txtFind.requestFocus();
         }
     }
@@ -139,7 +140,7 @@ private void doSearch(SearchContext context, SearchAction action) {
             }
         }
 
-        int pos = textArea.getCaretPosition();
+        int pos = context.getSearchForward() ? textArea.getSelectionEnd() : textArea.getSelectionStart();
         textArea.setSelectionStart(pos);
         textArea.setSelectionEnd(pos);
         SearchResult result;