get fontmetrics from pg

[jalview.git] / src / jalview / gui / AlignmentPanel.java

diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index 4047ac8..8548c42 100755 (executable)
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -711,9 +711,8 @@ public class AlignmentPanel extends GAlignmentPanel
     Color currentColor = null;\r
     Color currentTextColor = null;\r
 \r
-    pg.setFont(new Font(av.getFont().getName(),\r
-                        Font.ITALIC,\r
-                        av.getFont().getSize()));\r
+    pg.setFont(idPanel.idCanvas.idfont);\r
+\r
     SequenceI seq;\r
     for (int i = startSeq; i < endSeq; i++)\r
     {\r
@@ -827,20 +826,20 @@ public class AlignmentPanel extends GAlignmentPanel
     pg.setClip(0, pi * pheight, pwidth, pheight);\r
 \r
     int ypos = hgap;\r
-    Font italic = new Font(av.getFont().getName(), Font.ITALIC,\r
-                           av.getFont().getSize());\r
-    pg.setFont(italic);\r
+\r
+\r
 \r
     do\r
     {\r
       for (int i = 0; i < av.alignment.getHeight(); i++)\r
       {\r
+        pg.setFont(idPanel.idCanvas.idfont);\r
         SequenceI s = av.alignment.getSequenceAt(i);\r
         String string = s.getDisplayId( av.getShowJVSuffix());\r
         int xPos = 0;\r
         if (av.rightAlignIds)\r
         {\r
-          FontMetrics fm = getFontMetrics(italic);\r
+          FontMetrics fm = pg.getFontMetrics();\r
           xPos = idWidth - fm.stringWidth( string ) - 4;\r
         }\r
         pg.drawString(string, xPos,\r
@@ -855,7 +854,6 @@ public class AlignmentPanel extends GAlignmentPanel
 \r
         pg.setFont(av.getFont());\r
         labels.drawComponent(pg, idWidth);\r
-        pg.setFont(italic);\r
         pg.translate(+3,\r
                      -ypos -\r
                      (av.getAlignment().getHeight() * av.charHeight));\r