Merge develop to Release_2_8_3_Branch

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

diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index 6ef5222..519f2e2 100755 (executable)
--- a/src/jalview/gui/ScalePanel.java
+++ b/src/jalview/gui/ScalePanel.java
@@ -423,6 +423,8 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
 
     // Fill the selected columns
     ColumnSelection cs = av.getColumnSelection();
+    int avCharWidth = av.getCharWidth(), avCharHeight = av.getCharHeight();
+
     int s;
     if (cs != null)
     {
@@ -445,7 +447,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
 
         if ((sel >= startx) && (sel <= endx))
         {
-          gg.fillRect((sel - startx) * av.charWidth, 0, av.charWidth,
+          gg.fillRect((sel - startx) * avCharWidth, 0, avCharWidth,
                   getHeight());
         }
       }
@@ -456,7 +458,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
     int scalestartx = (startx / 10) * 10;
 
     FontMetrics fm = gg.getFontMetrics(av.getFont());
-    int y = av.charHeight - fm.getDescent();
+    int y = avCharHeight - fm.getDescent();
 
     if ((scalestartx % 10) == 0)
     {
@@ -472,26 +474,22 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
       {
         string = String.valueOf(av.getColumnSelection()
                 .adjustForHiddenColumns(i));
-        if ((i - startx - 1) * av.charWidth > maxX)
+        if ((i - startx - 1) * avCharWidth > maxX)
         {
-          gg.drawString(string, (i - startx - 1) * av.charWidth, y);
-          maxX = (i - startx + 1) * av.charWidth + fm.stringWidth(string);
+          gg.drawString(string, (i - startx - 1) * avCharWidth, y);
+          maxX = (i - startx + 1) * avCharWidth + fm.stringWidth(string);
         }
 
-        gg.drawLine(
-                ((i - startx - 1) * av.charWidth) + (av.charWidth / 2),
+        gg.drawLine(((i - startx - 1) * avCharWidth) + (avCharWidth / 2),
                 y + 2,
-                ((i - startx - 1) * av.charWidth) + (av.charWidth / 2),
+                ((i - startx - 1) * avCharWidth) + (avCharWidth / 2),
                 y + (fm.getDescent() * 2));
-
       }
       else
       {
-        gg.drawLine(
-                ((i - startx - 1) * av.charWidth) + (av.charWidth / 2),
-                y + fm.getDescent(),
-                ((i - startx - 1) * av.charWidth) + (av.charWidth / 2),
-                y + (fm.getDescent() * 2));
+        gg.drawLine(((i - startx - 1) * avCharWidth) + (avCharWidth / 2),
+                y + fm.getDescent(), ((i - startx - 1) * avCharWidth)
+                + (avCharWidth / 2), y + (fm.getDescent() * 2));
       }
     }
 
@@ -515,10 +513,10 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
           }
 
           gg.fillPolygon(new int[]
-          { res * av.charWidth - av.charHeight / 4,
-              res * av.charWidth + av.charHeight / 4, res * av.charWidth },
+          { res * avCharWidth - avCharHeight / 4,
+              res * avCharWidth + avCharHeight / 4, res * avCharWidth },
                   new int[]
-                  { y - av.charHeight / 2, y - av.charHeight / 2, y + 8 },
+                  { y - avCharHeight / 2, y - avCharHeight / 2, y + 8 },
                   3);
 
         }
@@ -527,7 +525,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
       if (reveal != null && reveal[0] > startx && reveal[0] < endx)
       {
         gg.drawString(MessageManager.getString("label.reveal_columns"),
-                reveal[0] * av.charWidth, 0);
+                reveal[0] * avCharWidth, 0);
       }
     }