use NEW_WINDOW_WIDTH

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

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