wrap align correction for last row

diff --git a/src/jalview/appletgui/IdCanvas.java b/src/jalview/appletgui/IdCanvas.java
index cc042ed..80533f2 100755 (executable)
--- a/src/jalview/appletgui/IdCanvas.java
+++ b/src/jalview/appletgui/IdCanvas.java
@@ -135,7 +135,7 @@ public class IdCanvas extends Panel
           int rowSize =  av.getEndRes() - av.getStartRes();\r
           // Draw the rest of the panels\r
 \r
-          for(int ypos=2*av.charHeight, row=av.getEndRes()-rowSize;\r
+          for(int ypos=2*av.charHeight, row=av.startRes;\r
               ypos <= getSize().height && row<av.alignment.getWidth();\r
               ypos += av.chunkHeight, row+=rowSize )\r
           {\r

diff --git a/src/jalview/appletgui/SeqCanvas.java b/src/jalview/appletgui/SeqCanvas.java
index 4305abe..679d48b 100755 (executable)
--- a/src/jalview/appletgui/SeqCanvas.java
+++ b/src/jalview/appletgui/SeqCanvas.java
@@ -250,6 +250,8 @@ public void fastPaint(int horizontal, int vertical)
       int cWidth  =   (canvasWidth - LABEL_EAST -LABEL_WEST)/av.charWidth;\r
       int cHeight =  (av.getAlignment().getHeight() + 2)*av.charHeight;\r
 \r
+      av.endRes = av.startRes + cWidth;\r
+\r
       int  endx   = startRes+cWidth-1;\r
       int  ypos  = 2*av.charHeight;\r
 \r

diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java
index d7a034c..048fb37 100755 (executable)
--- a/src/jalview/gui/IdCanvas.java
+++ b/src/jalview/gui/IdCanvas.java
@@ -132,7 +132,7 @@ public class IdCanvas extends JPanel
           int rowSize =  av.getEndRes() - av.getStartRes();\r
           // Draw the rest of the panels\r
 \r
-          for(int ypos=2*av.charHeight, row=av.getEndRes()-rowSize;\r
+          for(int ypos=2*av.charHeight, row=av.startRes;\r
               ypos <= getHeight() && row<av.alignment.getWidth();\r
               ypos += av.chunkHeight, row+=rowSize )\r
           {\r

diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java
index f3e7532..1a8ae3d 100755 (executable)
--- a/src/jalview/gui/SeqCanvas.java
+++ b/src/jalview/gui/SeqCanvas.java
@@ -252,6 +252,8 @@ public void fastPaint(int horizontal, int vertical)
       int cWidth  =   (canvasWidth - LABEL_EAST -LABEL_WEST)/av.charWidth;\r
       int cHeight =  (av.getAlignment().getHeight() + 2)*av.charHeight;\r
 \r
+      av.endRes = av.startRes + cWidth;\r
+\r
       int  endx   = startRes+cWidth-1;\r
       int  ypos  = 2*av.charHeight;\r
 \r