From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Sun, 28 Jul 2019 10:05:32 +0000 (+0100)
Subject: JAL-3377 corrected wrapped widths height for IdCanvas
X-Git-Tag: Release_2_11_1_0~28^2~7
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b42ccac80eaaeed0dcca07af811aa49f7ba88fbd;p=jalview.git

JAL-3377 corrected wrapped widths height for IdCanvas
---

diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java
index 951db78..42376c7 100755
--- a/src/jalview/gui/IdCanvas.java
+++ b/src/jalview/gui/IdCanvas.java
@@ -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)
      */