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-2664 Initial change to drawing hidden regions in overview
[jalview.git]
/
src
/
jalview
/
viewmodel
/
OverviewDimensionsShowHidden.java
diff --git
a/src/jalview/viewmodel/OverviewDimensionsShowHidden.java
b/src/jalview/viewmodel/OverviewDimensionsShowHidden.java
index
c4b69a8
..
681d43d
100644
(file)
--- a/
src/jalview/viewmodel/OverviewDimensionsShowHidden.java
+++ b/
src/jalview/viewmodel/OverviewDimensionsShowHidden.java
@@
-81,7
+81,9
@@
public class OverviewDimensionsShowHidden extends OverviewDimensions
int visXAsRes = hiddenCols.findColumnPosition(xAsRes);
yAsSeq = hiddenSeqs.adjustForHiddenSeqs(
hiddenSeqs.findIndexWithoutHiddenSeqs(yAsSeq));
int visXAsRes = hiddenCols.findColumnPosition(xAsRes);
yAsSeq = hiddenSeqs.adjustForHiddenSeqs(
hiddenSeqs.findIndexWithoutHiddenSeqs(yAsSeq));
+ yAsSeq = Math.max(yAsSeq, 0); // -1 if before first visible sequence
int visYAsSeq = hiddenSeqs.findIndexWithoutHiddenSeqs(yAsSeq);
int visYAsSeq = hiddenSeqs.findIndexWithoutHiddenSeqs(yAsSeq);
+ visYAsSeq = Math.max(visYAsSeq, 0); // -1 if before first visible sequence
// update viewport accordingly
updateViewportFromTopLeft(visXAsRes, visYAsSeq, hiddenSeqs, hiddenCols);
// update viewport accordingly
updateViewportFromTopLeft(visXAsRes, visYAsSeq, hiddenSeqs, hiddenCols);
@@
-125,6
+127,11
@@
public class OverviewDimensionsShowHidden extends OverviewDimensions
visYAsSeq = 0;
}
visYAsSeq = 0;
}
+ if (ranges.isWrappedMode())
+ {
+ visYAsSeq = 0; // sorry, no vertical scroll when wrapped
+ }
+
// Determine where scrollCol should be, given visXAsRes
// get viewport width in residues
// Determine where scrollCol should be, given visXAsRes
// get viewport width in residues