corrections for find when edit takes place

[jalview.git] / src / jalview / appletgui / AlignmentPanel.java

diff --git a/src/jalview/appletgui/AlignmentPanel.java b/src/jalview/appletgui/AlignmentPanel.java
index ddfc432..68746e3 100755 (executable)
--- a/src/jalview/appletgui/AlignmentPanel.java
+++ b/src/jalview/appletgui/AlignmentPanel.java
@@ -76,6 +76,7 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
   {\r
      public void keyPressed(KeyEvent evt)\r
      {\r
+       System.out.println(evt.getKeyCode());\r
        switch(evt.getKeyCode())\r
        {\r
          case  27: // escape key\r
@@ -192,12 +193,17 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
    seqPanel.seqCanvas.highlightSearchResults( results );\r
 \r
    // do we need to scroll the panel?\r
-   if(results!=null && (av.getStartSeq()>results[0]\r
-                        || av.getEndSeq()<results[0]\r
-                        || av.getStartRes()>results[1]\r
-                        || av.getEndRes()<results[2]))\r
-       setScrollValues(results[1], results[0]);\r
-\r
+   if(results!=null)\r
+    {\r
+      SequenceI seq = av.alignment.getSequenceAt(results[0]);\r
+      int start = seq.findIndex( results[1] )-1;\r
+      int end = seq.findIndex( results[2] )-1;\r
+      if( av.getStartRes() > start\r
+          || av.getEndRes() < end\r
+          || (av.getStartSeq() > results[0]\r
+          || av.getEndSeq() < results[0]))\r
+        setScrollValues(start, results[0]);\r
+    }\r
 \r
  }\r
 \r