From: Jim Procter <jprocter@issues.jalview.org>
Date: Tue, 28 Nov 2017 14:45:15 +0000 (+0000)
Subject: Merge branch 'bug/JAL-2827' into develop
X-Git-Tag: Release_2_10_3b1~5^2~6
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=a6fabf7609ac77122ebfab9924d95ae0f9cbf10e;hp=20b31018f8b3e0ed6342760db8d194f8c66d335a;p=jalview.git

Merge branch 'bug/JAL-2827' into develop
---

diff --git a/src/jalview/renderer/AnnotationRenderer.java b/src/jalview/renderer/AnnotationRenderer.java
index 41772d4..8a80d41 100644
--- a/src/jalview/renderer/AnnotationRenderer.java
+++ b/src/jalview/renderer/AnnotationRenderer.java
@@ -162,7 +162,8 @@ public class AnnotationRenderer
           boolean validRes, boolean validEnd)
   {
     g.setColor(STEM_COLOUR);
-    int sCol = (lastSSX / charWidth) + startRes;
+    int sCol = (lastSSX / charWidth)
+            + hiddenColumns.adjustForHiddenColumns(startRes);
     int x1 = lastSSX;
     int x2 = (x * charWidth);
 
@@ -228,7 +229,8 @@ public class AnnotationRenderer
     // System.out.println(nonCanColor);
 
     g.setColor(nonCanColor);
-    int sCol = (lastSSX / charWidth) + startRes;
+    int sCol = (lastSSX / charWidth)
+            + hiddenColumns.adjustForHiddenColumns(startRes);
     int x1 = lastSSX;
     int x2 = (x * charWidth);
 
@@ -1147,7 +1149,8 @@ public class AnnotationRenderer
   {
     g.setColor(HELIX_COLOUR);
 
-    int sCol = (lastSSX / charWidth) + startRes;
+    int sCol = (lastSSX / charWidth)
+            + hiddenColumns.adjustForHiddenColumns(startRes);
     int x1 = lastSSX;
     int x2 = (x * charWidth);