git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d72092c
)
JAL-3377 corrected wrapped widths height for IdCanvas
author
gmungoc
<g.m.carstairs@dundee.ac.uk>
Sun, 28 Jul 2019 10:05:32 +0000
(11:05 +0100)
committer
gmungoc
<g.m.carstairs@dundee.ac.uk>
Mon, 29 Jul 2019 10:22:39 +0000
(11:22 +0100)
src/jalview/gui/IdCanvas.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/IdCanvas.java
b/src/jalview/gui/IdCanvas.java
index
951db78
..
42376c7
100755
(executable)
--- 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;
int annotationHeight = 0;
+ final int charHeight = alignViewport.getCharHeight();
+ int hgap = charHeight;
+ if (alignViewport.getScaleAboveWrapped())
+ {
+ hgap += charHeight;
+ }
+
AnnotationLabels labels = null;
if (alignViewport.isShowAnnotation())
{
AnnotationLabels labels = null;
if (alignViewport.isShowAnnotation())
{
+ hgap += SeqCanvas.SEQS_ANNOTATION_GAP;
if (ap == null)
{
ap = new AnnotationPanel(alignViewport);
if (ap == null)
{
ap = new AnnotationPanel(alignViewport);
@@
-393,13
+401,6
@@
public class IdCanvas extends JPanel implements ViewportListenerI
labels = new AnnotationLabels(alignViewport);
}
labels = new AnnotationLabels(alignViewport);
}
- final int charHeight = alignViewport.getCharHeight();
- int hgap = charHeight;
- if (alignViewport.getScaleAboveWrapped())
- {
- hgap += charHeight;
- }
-
/*
* height of alignment + gap + annotations (if shown)
*/
/*
* height of alignment + gap + annotations (if shown)
*/