Use propertyListener for alignment edits

[jalview.git] / src / jalview / appletgui / SeqCanvas.java

diff --git a/src/jalview/appletgui/SeqCanvas.java b/src/jalview/appletgui/SeqCanvas.java
index 3202fc4..8ffad08 100755 (executable)
--- a/src/jalview/appletgui/SeqCanvas.java
+++ b/src/jalview/appletgui/SeqCanvas.java
@@ -21,7 +21,6 @@ package jalview.appletgui;
 \r
 import java.awt.*;\r
 \r
-import jalview.analysis.*;\r
 import jalview.datamodel.*;\r
 \r
 public class SeqCanvas\r
@@ -242,7 +241,7 @@ public class SeqCanvas
 \r
     if (av.getWrapAlignment())\r
     {\r
-      drawWrappedPanel(gg, getSize().width, getSize().height, av.startRes);\r
+      drawWrappedPanel(gg, imgWidth, imgHeight, av.startRes);\r
     }\r
     else\r
     {\r
@@ -339,24 +338,16 @@ public class SeqCanvas
         drawNorthScale(g, startRes, endx, ypos);\r
       }\r
 \r
-      // When printing we have an extra clipped region,\r
-      // the Printable page which we need to account for here\r
-      Shape clip = g.getClip();\r
-      if (clip == null)\r
-      {\r
-        g.setClip(0, 0, cWidth * av.charWidth, canvasHeight);\r
-      }\r
-      else\r
-      {\r
-        g.setClip(0,\r
-                  (int) clip.getBounds().y,\r
-                  cWidth * av.charWidth,\r
-                  (int) clip.getBounds().height\r
-            );\r
-      }\r
 \r
-      drawPanel(g, startRes, endx, 0, al.getHeight(), startRes, 0, ypos);\r
-      g.setClip(clip);\r
+     if(g.getClip()==null)\r
+       g.setClip(0, 0, cWidth * av.charWidth, canvasHeight);\r
+\r
+     if (av.alignment.getWidth() >= av.vconsensus.size())\r
+     {\r
+       endx = av.vconsensus.size() - 2;\r
+     }\r
+     drawPanel(g, startRes, endx, 0, al.getHeight(), startRes, 0, ypos);\r
+      g.setClip(null);\r
       g.translate( -LABEL_WEST, 0);\r
 \r
       ypos += cHeight;\r