Merge branch 'bug/JAL-2665-2.10.3' into portforward/JAL-2675_2102b1to2103

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

diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java
index 05cc6a9..d04d6f3 100755 (executable)
--- a/src/jalview/gui/SeqCanvas.java
+++ b/src/jalview/gui/SeqCanvas.java
@@ -765,7 +765,8 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
       hgap += charHeight;
     }
 
-    int cWidth = (canvasWidth - LABEL_EAST - LABEL_WEST) / charWidth;
+    int cWidth = (canvasWidth - labelWidthEast - labelWidthWest)
+            / charWidth;
     int cHeight = av.getAlignment().getHeight() * charHeight;
 
     int startx = startRes;
@@ -791,13 +792,13 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
         endx = maxwidth;
       }
 
-      g.translate(LABEL_WEST, 0);
+      g.translate(labelWidthWest, 0);
 
       drawUnwrappedSelection(g, group, startx, endx, 0,
               av.getAlignment().getHeight() - 1,
               ypos);
 
-      g.translate(-LABEL_WEST, 0);
+      g.translate(-labelWidthWest, 0);
 
       // update vertical offset
       ypos += cHeight + getAnnotationHeight() + hgap;
@@ -829,6 +830,7 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
    * marker.
    * 
    * @param g1
+   *          Graphics object to draw with
    * @param startRes
    *          offset of the first column in the visible region (0..)
    * @param endRes