X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSeqPanel.java;h=3bfc7db208167d24399600f1dc45066af77ad169;hb=1340920fd1b15c9bc8cd2284def7ec176a4989d5;hp=c39396efa5dc4ec0708b52d440ca2f5388b596ce;hpb=9f9494f3319ec24f962437826e7db705bc0c4665;p=jalview.git

diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index c39396e..3bfc7db 100755
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -175,8 +175,6 @@ public class SeqPanel extends JPanel
       y %= chunkHeight;
       seq =     y / av.getCharHeight() + av.getStartSeq();
 
-      //   chunkHeight =  (da.getHeight() + 2)*charHeight;
-      //  startx += chunkWidth;
     }
     else
     {
@@ -449,7 +447,6 @@ public class SeqPanel extends JPanel
       changeStartRes = true;
 
 
-    seqCanvas.paintFlag = true;
     repaint();
 
   }
@@ -470,7 +467,6 @@ public class SeqPanel extends JPanel
     if(stretchGroup.cs instanceof ClustalxColourScheme)
     {
       stretchGroup.cs = new ClustalxColourScheme(stretchGroup.sequences, av.alignment.getWidth());
-      seqCanvas.paintFlag = true;
       repaint();
     }
 
@@ -484,7 +480,6 @@ public class SeqPanel extends JPanel
 
        Desktop.setConservationSliderSource(ap, stretchGroup.cs, stretchGroup.getName()) ;
 
-       seqCanvas.paintFlag = true;
        repaint();
     }
     else
@@ -516,6 +511,10 @@ public class SeqPanel extends JPanel
     if(stretchGroup==null)
       return;
 
+    if(res>av.alignment.getWidth()-2)
+      res = av.alignment.getWidth()-2;
+
+
     if(stretchGroup.getEndRes()==res)
       // Edit end res position of selected group
       changeEndRes = true;
@@ -547,7 +546,7 @@ public class SeqPanel extends JPanel
     else if (y < oldSeq)
       dragDirection = -1;
 
-    while (y != oldSeq && oldSeq>0)
+    while (y != oldSeq && oldSeq>0 && y<av.alignment.getHeight())
     {
       // This routine ensures we don't skip any sequences, as the
       // selection is quite slow.
@@ -563,6 +562,7 @@ public class SeqPanel extends JPanel
       }
       else
       {
+       if(seq!=null)
         stretchGroup.addSequence(seq);
         stretchGroup.addSequence(nextSeq);
       }