X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAnnotationLabels.java;h=8b3a503ce83f644b2ce8e3a599743f023e093a9b;hb=b169b1a49c078d123feb729db6acb9779f50e7d6;hp=1df7455c6aba0111161a6e2e183072b3e40e1a63;hpb=ee53965807b83bf93a21cbc341cee9a9e005b2cb;p=jalview.git diff --git a/src/jalview/appletgui/AnnotationLabels.java b/src/jalview/appletgui/AnnotationLabels.java index 1df7455..8b3a503 100755 --- a/src/jalview/appletgui/AnnotationLabels.java +++ b/src/jalview/appletgui/AnnotationLabels.java @@ -83,7 +83,7 @@ public class AnnotationLabels } else if (evt.getActionCommand().equals(OUTPUT_TEXT)) { - CutAndPasteTransfer cap = new CutAndPasteTransfer(false, ap.alignFrame.applet); + CutAndPasteTransfer cap = new CutAndPasteTransfer(false, ap.alignFrame); Frame frame = new Frame(); frame.add(cap); jalview.bin.JalviewLite.addFrame(frame, @@ -159,7 +159,8 @@ public class AnnotationLabels public void drawComponent(Graphics g, int width) { - FontMetrics fm = g.getFontMetrics(g.getFont()); + g.setFont(av.getFont()); + FontMetrics fm = g.getFontMetrics(av.getFont()); g.setColor(Color.white); g.fillRect(0, 0, getSize().width, getSize().height); @@ -181,14 +182,14 @@ public class AnnotationLabels x = width - fm.stringWidth(aa[i].label) - 3; - if (aa[i].isGraph) + if (aa[i].graph>0) { y += (aa[i].height / 3); } g.drawString(aa[i].label, x, y); - if (aa[i].isGraph) + if (aa[i].graph>0) { y += (2 * aa[i].height / 3); }