X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSequenceRenderer.java;h=02ea4b5ee1da24ae7b40254ffa004b88f0d61c90;hb=bd56b8fb21d730b15bb759c529990d244cafbe37;hp=6350fbaa1f45b6b225b85b374be236cde068e84d;hpb=8dea1b9fa230ed6570f38a756b38c21af0e874c2;p=jalview.git

diff --git a/src/jalview/gui/SequenceRenderer.java b/src/jalview/gui/SequenceRenderer.java
index 6350fba..02ea4b5 100755
--- a/src/jalview/gui/SequenceRenderer.java
+++ b/src/jalview/gui/SequenceRenderer.java
@@ -41,7 +41,6 @@ public class SequenceRenderer
     Graphics graphics;
     boolean monospacedFont;
     boolean forOverview = false;
-    boolean validCharWidth = true;
 
     /**
      * Creates a new SequenceRenderer object.
@@ -63,8 +62,6 @@ public class SequenceRenderer
         graphics = g;
         fm = g.getFontMetrics();
         monospacedFont = fm.getStringBounds("M",g).getWidth()==fm.getStringBounds("|",g).getWidth();
-        validCharWidth = fm.charWidth('M') <= av.charWidth;
-
         this.renderGaps = renderGaps;
     }
 
@@ -132,7 +129,7 @@ public class SequenceRenderer
 
         drawBoxes(seq, start, end, y1);
 
-        if (validCharWidth)
+        if (av.validCharWidth)
           drawText(seq, start, end, y1);
     }
 
@@ -344,17 +341,20 @@ public class SequenceRenderer
         char s = '~';
 
         // Need to find the sequence position here.
-        for (int i = start; i <= end; i++)
+        if(av.validCharWidth)
         {
+          for (int i = start; i <= end; i++)
+          {
             if (i < seq.getLength())
             {
-                s = seq.getSequence().charAt(i);
+              s = seq.getSequence().charAt(i);
             }
 
             charOffset = (av.charWidth - fm.charWidth(s)) / 2;
             graphics.drawString(String.valueOf(s),
-                charOffset + x1 + (av.charWidth * (i - start)),
-                (y1 + av.charHeight) - pady);
+                                charOffset + x1 + (av.charWidth * (i - start)),
+                                (y1 + av.charHeight) - pady);
+          }
         }
     }
 
@@ -364,17 +364,18 @@ public class SequenceRenderer
       int charOffset = 0;
       graphics.setColor(Color.black);
       graphics.fillRect(x1, y1, av.charWidth, av.charHeight);
-      graphics.setColor(Color.white);
 
-      graphics.setColor(Color.white);
-
-      char s = seq.getCharAt(res);
+      if(av.validCharWidth)
+      {
+        graphics.setColor(Color.white);
 
-      charOffset = (av.charWidth - fm.charWidth(s)) / 2;
-      graphics.drawString(String.valueOf(s),
-                charOffset + x1,
-                (y1 + av.charHeight) - pady);
+        char s = seq.getCharAt(res);
 
+        charOffset = (av.charWidth - fm.charWidth(s)) / 2;
+        graphics.drawString(String.valueOf(s),
+                            charOffset + x1,
+                            (y1 + av.charHeight) - pady);
+      }
 
     }
 }