From: Jim Procter <jprocter@issues.jalview.org>
Date: Tue, 7 Apr 2020 11:48:59 +0000 (+0100)
Subject: Merge branch 'bug/JAL-247autoIdWidthSeqMarker' into develop
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Ftrial_merge%2Fdevelop%2Fbug%2FJAL-247autoIdWidthSeqMarker;p=jalview.git

Merge branch 'bug/JAL-247autoIdWidthSeqMarker' into develop
---

610c3b982af35c03ca23cb8592a5519f478157cc
diff --cc src/jalview/gui/IdCanvas.java
index a925227,b408c1b..35a932d
--- a/src/jalview/gui/IdCanvas.java
+++ b/src/jalview/gui/IdCanvas.java
@@@ -137,9 -138,9 +138,9 @@@ public class IdCanvas extends JPanel im
      g.drawString(s.getDisplayId(av.getShowJVSuffix()), xPos,
              (((i - starty + 1) * charHeight) + ypos) - (charHeight / 5));
  
 -    if (hiddenRows)
 +    if (hiddenRows && av.getShowHiddenMarkers())
      {
-       drawMarker(g, av, i, starty, ypos);
+       drawMarker(g, av, i, starty, ypos, idWidth);
      }
  
    }
@@@ -359,9 -361,9 +361,9 @@@
        g.drawString(string, xPos, (((i - startSeq) * charHeight) + charHeight)
                - (charHeight / 5));
  
 -      if (hasHiddenRows)
 +      if (hasHiddenRows && av.getShowHiddenMarkers())
        {
-         drawMarker(g, alignViewport, i, startSeq, 0);
+         drawMarker(g, alignViewport, i, startSeq, 0, idWidth);
        }
      }
    }