From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 19 Jul 2017 15:39:11 +0000 (+0100)
Subject: Merge branch 'develop' into features/JAL-2446NCList
X-Git-Tag: Release_2_10_3b1~175
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=c4b90e7ff57436d6bb96d316eed24c887b241f4d

Merge branch 'develop' into features/JAL-2446NCList

Conflicts:
	src/jalview/gui/AlignmentPanel.java
	src/jalview/gui/SeqCanvas.java
	src/jalview/gui/SeqPanel.java
---

c4b90e7ff57436d6bb96d316eed24c887b241f4d
diff --cc src/jalview/gui/SeqCanvas.java
index 47ef7cf,a134afa..0e31246
--- a/src/jalview/gui/SeqCanvas.java
+++ b/src/jalview/gui/SeqCanvas.java
@@@ -521,11 -528,9 +521,11 @@@ public class SeqCanvas extends JCompone
      if (av.hasHiddenColumns())
      {
        maxwidth = av.getAlignment().getHiddenColumns()
-               .findColumnPosition(maxwidth) - 1;
+               .findColumnPosition(maxwidth);
      }
  
 +    int annotationHeight = getAnnotationHeight();
 +
      while ((ypos <= canvasHeight) && (startRes < maxwidth))
      {
        endx = startRes + cWidth - 1;
diff --cc src/jalview/gui/SeqPanel.java
index ca79c73,6fbed49..2b1b0e5
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@@ -215,7 -204,7 +216,7 @@@ public class SeqPanel extends JPanel im
  
        int y = evt.getY();
        y -= hgap;
-       x -= seqCanvas.labelWidthWest;
 -      x = Math.max(0, x - seqCanvas.LABEL_WEST);
++      x = Math.max(0, x - seqCanvas.labelWidthWest);
  
        int cwidth = seqCanvas.getWrappedCanvasWidth(this.getWidth());
        if (cwidth < 1)