X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationPanel.java;h=d97c80f78a0c5f0714f119bf97a9f067932ab88a;hb=783520af519c958e10a2af29f1d4242e1ab890a3;hp=bc14d6637284dff184512cc7a445598730c71b3c;hpb=18b27ea838aeaca9964a46c9b833a47fbb372d3b;p=jalview.git diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java index bc14d66..d97c80f 100755 --- a/src/jalview/gui/AnnotationPanel.java +++ b/src/jalview/gui/AnnotationPanel.java @@ -76,6 +76,12 @@ public class AnnotationPanel extends JPanel implements MouseListener, ap.annotationScroller.getVerticalScrollBar().addAdjustmentListener(this); } + public AnnotationPanel(AlignViewport av) + { + this.av = av; + } + + /** * DOCUMENT ME! * @@ -89,7 +95,7 @@ public class AnnotationPanel extends JPanel implements MouseListener, /** * DOCUMENT ME! */ - public void adjustPanelHeight() + public int adjustPanelHeight() { // setHeight of panels image = null; @@ -136,6 +142,8 @@ public class AnnotationPanel extends JPanel implements MouseListener, } this.setPreferredSize(new Dimension(1, height)); + + return height; } /** @@ -606,13 +614,13 @@ public class AnnotationPanel extends JPanel implements MouseListener, * @param startRes DOCUMENT ME! * @param endRes DOCUMENT ME! */ - public void drawComponent(Graphics2D g, int startRes, int endRes) + public void drawComponent(Graphics g, int startRes, int endRes) { + g.setFont(av.getFont()); + if (fm == null) fm = g.getFontMetrics(); - if(fm==null) - fm = g.getFontMetrics(); g.setColor(Color.white); g.fillRect(0, 0, (endRes - startRes) * av.charWidth, getHeight());