From b42ccac80eaaeed0dcca07af811aa49f7ba88fbd Mon Sep 17 00:00:00 2001 From: gmungoc Date: Sun, 28 Jul 2019 11:05:32 +0100 Subject: [PATCH] JAL-3377 corrected wrapped widths height for IdCanvas --- src/jalview/gui/IdCanvas.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) 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) */ -- 1.7.10.2