X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSeqPanel.java;h=a4d924073bbc11d04364c081b3d5e5b8f00135c6;hb=c9c74c082bdd9323850a864144dc8a9b36399157;hp=9ea087e9008801ec429dce5e74bad03e752d0f2d;hpb=9d5b115c3b60ca2ae4bfb796088d8ca753d46b07;p=jalview.git

diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index 9ea087e..a4d9240 100755
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -147,7 +147,6 @@ public class SeqPanel extends JPanel implements MouseListener,
 
    int findSeq(MouseEvent evt)
    {
-
      int seq = 0;
      int y = evt.getY();
 
@@ -162,11 +161,13 @@ public class SeqPanel extends JPanel implements MouseListener,
 
          y -= hgap;
 
-       seq = ( (y % cHeight) / av.getCharHeight());
+       seq = Math.min( (y % cHeight) / av.getCharHeight(),
+                       av.alignment.getHeight() -1);
      }
      else
      {
-       seq = (y / av.getCharHeight()) + av.getStartSeq();
+       seq = Math.min( (y / av.getCharHeight()) + av.getStartSeq(),
+                       av.alignment.getHeight() -1);
      }
 
      return seq;
@@ -1032,8 +1033,6 @@ public class SeqPanel extends JPanel implements MouseListener,
 
       if (blankColumn <= j)
       {
-        System.out.println("END HERE "+seq.getName()+" "+seq.getLength()+" "+j+" "
-            +blankColumn+" "+fixedColumn);
         blankColumn = fixedColumn;
         endEditing();
         return;
@@ -1244,14 +1243,6 @@ public class SeqPanel extends JPanel implements MouseListener,
 
         }
 
-        if (av.cursorMode)
-        {
-          seqCanvas.cursorX = findRes(evt);
-          seqCanvas.cursorY = findSeq(evt);
-          seqCanvas.repaint();
-          return;
-        }
-
 
         if (javax.swing.SwingUtilities.isRightMouseButton(evt))
         {
@@ -1272,9 +1263,18 @@ public class SeqPanel extends JPanel implements MouseListener,
 
             jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu(ap, null, links);
             pop.show(this, evt.getX(), evt.getY());
+            return;
+        }
 
+        if (av.cursorMode)
+        {
+          seqCanvas.cursorX = findRes(evt);
+          seqCanvas.cursorY = findSeq(evt);
+          seqCanvas.repaint();
+          return;
         }
-        else if (stretchGroup == null)
+
+        if (stretchGroup == null)
         {
           //Only if left mouse button do we want to change group sizes
 
@@ -1373,11 +1373,6 @@ public class SeqPanel extends JPanel implements MouseListener,
             return;
        }
 
-
-        if(y > av.alignment.getHeight())
-        {
-          y = av.alignment.getHeight() -1;
-        }
         if(res> av.alignment.getWidth())
         {
           res = av.alignment.getWidth()-1;