X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FIdCanvas.java;fp=src%2Fjalview%2Fgui%2FIdCanvas.java;h=4d10db02945a1d3fab89c62585de0e8a34ab4c7f;hb=8ecde76adb5ba58ed98ee23b94c75b69f7877bb1;hp=2df84a9eede25350b8220b742db40c4dc023d2bd;hpb=fc7dac25fd7a4eac42083e9aa94d1e752cabbe8b;p=jalview.git diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java index 2df84a9..4d10db0 100755 --- a/src/jalview/gui/IdCanvas.java +++ b/src/jalview/gui/IdCanvas.java @@ -307,7 +307,7 @@ public class IdCanvas extends JPanel implements ViewportListenerI if (alignViewport.getWrapAlignment()) { - drawIdsWrapped(g, alignViewport, startSeq, getHeight()); + drawIdsWrapped(g, alignViewport, startSeq, getHeight(), panelWidth,forGUI); return; } @@ -401,7 +401,7 @@ public class IdCanvas extends JPanel implements ViewportListenerI drawIdsWrapped(g, av2, totalHeight, totalHeight, i,false); } - void drawIdsWrapped(Graphics2D g, AlignViewport alignViewport, + public void drawIdsWrapped(Graphics2D g, AlignViewport alignViewport, int startSeq, int pageHeight, int idWidth, boolean forGUI) { int alignmentWidth = alignViewport.getAlignment().getWidth(); @@ -418,6 +418,8 @@ public class IdCanvas extends JPanel implements ViewportListenerI AnnotationLabels labels = null; if (alignViewport.isShowAnnotation()) { + // in wrapped mode, no alignPanel reference is available + // FIXME: make the renderer not create a new object in wrapped mode everytime! labels = new AnnotationLabels(alignViewport); }