Merge branch 'bug/JAL-247autoIdWidthSeqMarker' into develop trial_merge/develop/bug/JAL-247autoIdWidthSeqMarker
authorJim Procter <jprocter@issues.jalview.org>
Tue, 7 Apr 2020 11:48:59 +0000 (12:48 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 7 Apr 2020 11:48:59 +0000 (12:48 +0100)
1  2 
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/IdCanvas.java

Simple merge
@@@ -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);
      }
  
    }
        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);
        }
      }
    }