validCharWidth moved to viewport

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

diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java
index 232a60c..f9ed690 100755 (executable)
--- a/src/jalview/gui/AnnotationPanel.java
+++ b/src/jalview/gui/AnnotationPanel.java
@@ -51,7 +51,6 @@ public class AnnotationPanel extends JPanel implements MouseListener,
     BufferedImage image;\r
     Graphics2D gg;\r
     FontMetrics fm;\r
-    boolean validCharWidth;\r
     int imgWidth = 0;\r
     boolean fastPaint = false;\r
 \r
@@ -643,7 +642,6 @@ public class AnnotationPanel extends JPanel implements MouseListener,
       if (fm == null)\r
         fm = g.getFontMetrics();\r
 \r
-      validCharWidth = fm.charWidth('M') <= av.charWidth;\r
 \r
         g.setColor(Color.white);\r
         g.fillRect(0, 0, (endRes - startRes) * av.charWidth, getHeight());\r
@@ -654,8 +652,8 @@ public class AnnotationPanel extends JPanel implements MouseListener,
             g.setColor(Color.white);\r
             g.fillRect(0, 0, getWidth(), getHeight());\r
             g.setColor(Color.black);\r
-            if(validCharWidth)\r
-            g.drawString("Alignment has no annotations", 20, 15);\r
+            if(av.validCharWidth)\r
+              g.drawString("Alignment has no annotations", 20, 15);\r
 \r
             return;\r
         }\r
@@ -753,7 +751,7 @@ public class AnnotationPanel extends JPanel implements MouseListener,
                     }\r
                 }\r
 \r
-                if (validCharWidth && validRes &&\r
+                if (av.validCharWidth && validRes &&\r
                         (row.annotations[column].displayCharacter.length() > 0))\r
                 {\r
 \r