X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FIdCanvas.java;fp=src%2Fjalview%2Fappletgui%2FIdCanvas.java;h=48c0c400d8f99facec7175f01b2941205761b5c2;hb=2de7aa8723cfe5071041cdf5b2c61c71646f637f;hp=991f3ea9c4c57cd7946d726cc11a7add0b6f87c2;hpb=d4ecfd4b33af067988249ea5e345f5b48e13f1de;p=jalview.git diff --git a/src/jalview/appletgui/IdCanvas.java b/src/jalview/appletgui/IdCanvas.java index 991f3ea..48c0c40 100755 --- a/src/jalview/appletgui/IdCanvas.java +++ b/src/jalview/appletgui/IdCanvas.java @@ -101,7 +101,7 @@ public class IdCanvas extends Panel implements ViewportListenerI public void fastPaint(int vertical) { - if (gg == null) + if (gg == null || av.getWrapAlignment()) { repaint(); return; @@ -306,8 +306,7 @@ public class IdCanvas extends Panel implements ViewportListenerI int cHeight = alheight * avcharHeight + hgap + annotationHeight; - int rowSize = av.getRanges().getEndRes() - - av.getRanges().getStartRes(); + int rowSize = av.getRanges().getViewportWidth(); // hardwired italic IDs in applet currently Font italic = new Font(av.getFont().getName(), Font.ITALIC, av @@ -318,8 +317,9 @@ public class IdCanvas extends Panel implements ViewportListenerI * draw repeating sequence ids until out of sequence data or * out of visible space, whichever comes first */ - for (int ypos = hgap, row = av.getRanges().getStartRes(); (ypos <= getSize().height) - && (row < maxwidth); ypos += cHeight, row += rowSize) + int ypos = hgap; + int row = av.getRanges().getStartRes(); + while ((ypos <= getHeight()) && (row < maxwidth)) { for (int i = starty; i < alheight; i++) { @@ -339,6 +339,8 @@ public class IdCanvas extends Panel implements ViewportListenerI labels.drawComponent(gg, getSize().width); gg.translate(0, -ypos - (alheight * avcharHeight)); } + ypos += cHeight; + row += rowSize; } }