JAL-1824 updated caching procedure for pdb entries. Also refactored getPDBEntry metho...

[jalview.git] / src / jalview / gui / SeqPanel.java

diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index 6cd5b70..e34a864 100644 (file)
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -167,6 +167,13 @@ public class SeqPanel extends JPanel implements MouseListener,
 
   int wrappedBlock = -1;
 
+  /**
+   * Returns the aligned sequence position (base 0) at the mouse position, or
+   * the closest visible one
+   * 
+   * @param evt
+   * @return
+   */
   int findRes(MouseEvent evt)
   {
     int res = 0;
@@ -203,13 +210,18 @@ public class SeqPanel extends JPanel implements MouseListener,
     }
     else
     {
-      if (x > seqCanvas.getWidth() + seqCanvas.getWidth())
+      if (x > seqCanvas.getX() + seqCanvas.getWidth())
       {
         // make sure we calculate relative to visible alignment, rather than
         // right-hand gutter
         x = seqCanvas.getX() + seqCanvas.getWidth();
       }
       res = (x / av.getCharWidth()) + av.getStartRes();
+      if (res > av.getEndRes())
+      {
+        // moused off right
+        res = av.getEndRes();
+      }
     }
 
     if (av.hasHiddenColumns())
@@ -649,6 +661,13 @@ public class SeqPanel extends JPanel implements MouseListener,
   {
     if (av.isFollowHighlight())
     {
+      /*
+       * if scrollToPosition requires a scroll adjustment, this flag prevents
+       * another scroll event being propagated back to the originator
+       * 
+       * @see AlignmentPanel#adjustmentValueChanged
+       */
+      ap.setFollowingComplementScroll(true);
       if (ap.scrollToPosition(results, false))
       {
         seqCanvas.revalidate();