JAL-3377 corrected wrapped widths height for IdCanvas
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Sun, 28 Jul 2019 10:05:32 +0000 (11:05 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Sun, 28 Jul 2019 10:05:32 +0000 (11:05 +0100)
src/jalview/gui/IdCanvas.java

index 951db78..42376c7 100755 (executable)
@@ -382,9 +382,17 @@ public class IdCanvas extends JPanel implements ViewportListenerI
 
     int annotationHeight = 0;
 
+    final int charHeight = alignViewport.getCharHeight();
+    int hgap = charHeight;
+    if (alignViewport.getScaleAboveWrapped())
+    {
+      hgap += charHeight;
+    }
+
     AnnotationLabels labels = null;
     if (alignViewport.isShowAnnotation())
     {
+      hgap += SeqCanvas.SEQS_ANNOTATION_GAP;
       if (ap == null)
       {
         ap = new AnnotationPanel(alignViewport);
@@ -393,13 +401,6 @@ public class IdCanvas extends JPanel implements ViewportListenerI
       labels = new AnnotationLabels(alignViewport);
     }
 
-    final int charHeight = alignViewport.getCharHeight();
-    int hgap = charHeight;
-    if (alignViewport.getScaleAboveWrapped())
-    {
-      hgap += charHeight;
-    }
-
     /*
      * height of alignment + gap + annotations (if shown)
      */