git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-1894 update year/version in copyright
[jalview.git]
/
src
/
jalview
/
gui
/
AlignmentPanel.java
diff --git
a/src/jalview/gui/AlignmentPanel.java
b/src/jalview/gui/AlignmentPanel.java
index
1906829
..
9e9f1c1
100644
(file)
--- a/
src/jalview/gui/AlignmentPanel.java
+++ b/
src/jalview/gui/AlignmentPanel.java
@@
-1,5
+1,5
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
* Copyright (C) 2015 The Jalview Authors
*
* This file is part of Jalview.
* Copyright (C) 2015 The Jalview Authors
*
* This file is part of Jalview.
@@
-99,7
+99,7
@@
public class AlignmentPanel extends GAlignmentPanel implements
* Flag set while scrolling to follow complementary cDNA/protein scroll. When
* true, suppresses invoking the same method recursively.
*/
* Flag set while scrolling to follow complementary cDNA/protein scroll. When
* true, suppresses invoking the same method recursively.
*/
- private boolean followingComplementScroll;
+ private boolean dontScrollComplement;
/**
* Creates a new AlignmentPanel object.
/**
* Creates a new AlignmentPanel object.
@@
-566,6
+566,9
@@
public class AlignmentPanel extends GAlignmentPanel implements
annotationScroller.setPreferredSize(new Dimension(annotationScroller
.getWidth(), annotationHeight));
annotationScroller.setPreferredSize(new Dimension(annotationScroller
.getWidth(), annotationHeight));
+ Dimension e = idPanel.getSize();
+ alabels.setSize(new Dimension(e.width, annotationHeight));
+
annotationSpaceFillerHolder.setPreferredSize(new Dimension(
annotationSpaceFillerHolder.getWidth(), annotationHeight));
annotationScroller.validate();
annotationSpaceFillerHolder.setPreferredSize(new Dimension(
annotationSpaceFillerHolder.getWidth(), annotationHeight));
annotationScroller.validate();
@@
-729,7
+732,14
@@
public class AlignmentPanel extends GAlignmentPanel implements
x = 0;
}
x = 0;
}
+ /*
+ * each scroll adjustment triggers adjustmentValueChanged, which resets the
+ * 'do not scroll complement' flag; ensure it is the same for both
+ * operations
+ */
+ boolean flag = isDontScrollComplement();
hscroll.setValues(x, hextent, 0, width);
hscroll.setValues(x, hextent, 0, width);
+ setDontScrollComplement(flag);
vscroll.setValues(y, vextent, 0, height);
}
vscroll.setValues(y, vextent, 0, height);
}
@@
-828,9
+838,9
@@
public class AlignmentPanel extends GAlignmentPanel implements
* If there is one, scroll the (Protein/cDNA) complementary alignment to
* match, unless we are ourselves doing that.
*/
* If there is one, scroll the (Protein/cDNA) complementary alignment to
* match, unless we are ourselves doing that.
*/
- if (isFollowingComplementScroll())
+ if (isDontScrollComplement())
{
{
- setFollowingComplementScroll(false);
+ setDontScrollComplement(false);
}
else
{
}
else
{
@@
-877,6
+887,12
@@
public class AlignmentPanel extends GAlignmentPanel implements
hscrollFillerPanel.setPreferredSize(new Dimension(d.width, 12));
validate();
hscrollFillerPanel.setPreferredSize(new Dimension(d.width, 12));
validate();
+ /*
+ * set scroll bar positions; first suppress this being 'followed' in any
+ * complementary split pane
+ */
+ setDontScrollComplement(true);
+
if (av.getWrapAlignment())
{
int maxwidth = av.getAlignment().getWidth();
if (av.getWrapAlignment())
{
int maxwidth = av.getAlignment().getWidth();
@@
-1786,17
+1802,17
@@
public class AlignmentPanel extends GAlignmentPanel implements
}
/**
}
/**
- * Set a flag to say we are scrolling to follow a (cDNA/protein) complement.
+ * Set a flag to say do not scroll any (cDNA/protein) complement.
*
* @param b
*/
*
* @param b
*/
- protected void setFollowingComplementScroll(boolean b)
+ protected void setDontScrollComplement(boolean b)
{
{
- this.followingComplementScroll = b;
+ this.dontScrollComplement = b;
}
}
- protected boolean isFollowingComplementScroll()
+ protected boolean isDontScrollComplement()
{
{
- return this.followingComplementScroll;
+ return this.dontScrollComplement;
}
}
}
}