Use Container to get fontMetrics
authoramwaterhouse <Andrew Waterhouse>
Wed, 3 Aug 2005 13:08:14 +0000 (13:08 +0000)
committeramwaterhouse <Andrew Waterhouse>
Wed, 3 Aug 2005 13:08:14 +0000 (13:08 +0000)
src/jalview/gui/AlignViewport.java
src/jalview/gui/AlignmentPanel.java

index 3af97ab..904e1e2 100755 (executable)
@@ -531,10 +531,9 @@ public class AlignViewport
     {\r
         font = f;\r
 \r
-        javax.swing.JFrame temp = new javax.swing.JFrame();\r
-        temp.addNotify();\r
+        Container c = new Container();\r
 \r
-        java.awt.FontMetrics fm = temp.getGraphics().getFontMetrics(font);\r
+        java.awt.FontMetrics fm = c.getFontMetrics(font);\r
         setCharHeight(fm.getHeight());\r
         setCharWidth(fm.charWidth('M'));\r
     }\r
index d1b9350..7aff9ab 100755 (executable)
@@ -167,16 +167,9 @@ public class AlignmentPanel extends GAlignmentPanel
      */\r
     public Dimension calculateIdWidth()\r
     {\r
-        Graphics g = this.getGraphics();\r
+      Container c = new Container();\r
 \r
-        if (g == null)\r
-        {\r
-            javax.swing.JFrame f = new javax.swing.JFrame();\r
-            f.addNotify();\r
-            g = f.getGraphics();\r
-        }\r
-\r
-        FontMetrics fm = g.getFontMetrics(av.font);\r
+        FontMetrics fm = c.getFontMetrics(av.font);\r
         AlignmentI al = av.getAlignment();\r
 \r
         int i = 0;\r
@@ -209,7 +202,7 @@ public class AlignmentPanel extends GAlignmentPanel
 \r
         if (al.getAlignmentAnnotation() != null)\r
         {\r
-            fm = g.getFontMetrics(alabels.getFont());\r
+            fm = c.getFontMetrics(alabels.getFont());\r
 \r
             while (i < al.getAlignmentAnnotation().length)\r
             {\r