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 (from parent 1:
ecf2d49
)
patch for JAL-695 - need to test if this is observed in applet
author
jprocter
<Jim Procter>
Tue, 18 Jan 2011 17:46:08 +0000
(17:46 +0000)
committer
jprocter
<Jim Procter>
Tue, 18 Jan 2011 17:46:08 +0000
(17:46 +0000)
src/jalview/appletgui/AlignmentPanel.java
patch
|
blob
|
history
diff --git
a/src/jalview/appletgui/AlignmentPanel.java
b/src/jalview/appletgui/AlignmentPanel.java
index
6d4c63b
..
0519f47
100755
(executable)
--- a/
src/jalview/appletgui/AlignmentPanel.java
+++ b/
src/jalview/appletgui/AlignmentPanel.java
@@
-224,6
+224,10
@@
public class AlignmentPanel extends Panel implements AdjustmentListener
return new Dimension(idWidth, idPanel.idCanvas.getSize().height);
}
return new Dimension(idWidth, idPanel.idCanvas.getSize().height);
}
+ /**
+ * Highlight the given results on the alignment.
+ *
+ */
public void highlightSearchResults(SearchResults results)
{
seqPanel.seqCanvas.highlightSearchResults(results);
public void highlightSearchResults(SearchResults results)
{
seqPanel.seqCanvas.highlightSearchResults(results);
@@
-261,6
+265,19
@@
public class AlignmentPanel extends Panel implements AdjustmentListener
{
return;
}
{
return;
}
+ if (av.hasHiddenColumns)
+ {
+ start = av.getColumnSelection().findColumnPosition(start);
+ end = av.getColumnSelection().findColumnPosition(end);
+ if (start==end)
+ {
+ if (!av.colSel.isVisible(r[0]))
+ {
+ // don't scroll - position isn't visible
+ return;
+ }
+ }
+ }
if (!av.wrapAlignment)
{
if ((av.getStartRes() > end)
if (!av.wrapAlignment)
{
if ((av.getStartRes() > end)