From 6a5e618f368b1e0d828629228fd5c238ddef484d Mon Sep 17 00:00:00 2001
From: amwaterhouse <Andrew Waterhouse>
Date: Fri, 28 Apr 2006 12:35:12 +0000
Subject: [PATCH] validCharWidth checks

---
 src/jalview/gui/SeqPanel.java         |   63 +++++++++++++++------------------
 src/jalview/gui/SequenceRenderer.java |    6 +++-
 2 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index d081f16..9d2e84c 100755
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -597,48 +597,43 @@ public class SeqPanel extends JPanel implements MouseListener,
      */
     public void mouseDragged(MouseEvent evt)
     {
-      if(mouseWheelPressed)
+      if (mouseWheelPressed)
       {
         int oldWidth = av.charWidth;
 
         //Which is bigger, left-right or up-down?
-        if( Math.abs(evt.getY()-lastMousePress.getY())
-          > Math.abs(evt.getX()-lastMousePress.getX()))
-     {
-       int fontSize = av.font.getSize();
-
-       if (evt.getY() < lastMousePress.getY() && av.charHeight > 1)
-       {
-         fontSize--;
-       }
-       else if (evt.getY() > lastMousePress.getY())
-       {
-         fontSize++;
-       }
+        if (Math.abs(evt.getY() - lastMousePress.getY())
+            > Math.abs(evt.getX() - lastMousePress.getX()))
+        {
+          int fontSize = av.font.getSize();
 
-       av.setFont(new Font(av.font.getName(), av.font.getStyle(), fontSize));
-       av.charWidth = oldWidth;
-       ap.fontChanged();
+          if (evt.getY() < lastMousePress.getY() && av.charHeight > 1)
+          {
+            fontSize--;
+          }
+          else if (evt.getY() > lastMousePress.getY())
+          {
+            fontSize++;
+          }
 
+          av.setFont(new Font(av.font.getName(), av.font.getStyle(), fontSize));
+          av.charWidth = oldWidth;
+          ap.fontChanged();
 
-     }
-     else
-     {
-       if (evt.getX() < lastMousePress.getX() && av.charWidth > 1)
-       {
-         av.charWidth--;
-       }
-       else if (evt.getX() > lastMousePress.getX())
-       {
-         av.charWidth++;
-       }
-
-       ap.repaint();
-     }
+        }
+        else
+        {
+          if (evt.getX() < lastMousePress.getX() && av.charWidth > 1)
+          {
+            av.charWidth--;
+          }
+          else if (evt.getX() > lastMousePress.getX())
+          {
+            av.charWidth++;
+          }
 
-      FontMetrics fm = getFontMetrics(av.getFont());
-      av.showText = (fm.charWidth('M') < av.charWidth);
-               // && fm.getHeight()<av.charHeight
+          ap.repaint();
+        }
 
         lastMousePress = evt.getPoint();
 
diff --git a/src/jalview/gui/SequenceRenderer.java b/src/jalview/gui/SequenceRenderer.java
index ec93abf..6350fba 100755
--- a/src/jalview/gui/SequenceRenderer.java
+++ b/src/jalview/gui/SequenceRenderer.java
@@ -41,6 +41,7 @@ public class SequenceRenderer
     Graphics graphics;
     boolean monospacedFont;
     boolean forOverview = false;
+    boolean validCharWidth = true;
 
     /**
      * Creates a new SequenceRenderer object.
@@ -62,6 +63,8 @@ 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;
     }
 
@@ -129,7 +132,8 @@ public class SequenceRenderer
 
         drawBoxes(seq, start, end, y1);
 
-        drawText(seq, start, end, y1);
+        if (validCharWidth)
+          drawText(seq, start, end, y1);
     }
 
     /**
-- 
1.7.10.2