{\r
seqCanvas.cursorX += dx;\r
seqCanvas.cursorY += dy;\r
+ if (av.hasHiddenColumns && !av.colSel.isVisible(seqCanvas.cursorX))\r
+ {\r
+ int original = seqCanvas.cursorX - dx;\r
+ int maxWidth = av.alignment.getWidth();\r
+\r
+ while(!av.colSel.isVisible(seqCanvas.cursorX)\r
+ && seqCanvas.cursorX<maxWidth\r
+ && seqCanvas.cursorX>0)\r
+ {\r
+ seqCanvas.cursorX += dx;\r
+ }\r
+\r
+ if(seqCanvas.cursorX>=maxWidth\r
+ || !av.colSel.isVisible(seqCanvas.cursorX) )\r
+ {\r
+ seqCanvas.cursorX = original;\r
+ }\r
+ }\r
+\r
scrollToVisible();\r
}\r
\r
}\r
if (!av.wrapAlignment)\r
{\r
- while (seqCanvas.cursorX < av.startRes)\r
+ while (seqCanvas.cursorX < av.colSel.adjustForHiddenColumns(av.startRes))\r
{\r
if (!ap.scrollRight(false))\r
break;\r
}\r
- while (seqCanvas.cursorX > av.endRes)\r
+ while (seqCanvas.cursorX > av.colSel.adjustForHiddenColumns(av.endRes))\r
{\r
if (!ap.scrollRight(true))\r
break;\r
\r
if(tooltipText.length()==6) // <html></html>\r
{\r
-\r
- setToolTipText("");\r
+ setToolTipText(null);\r
}\r
else\r
{\r
}\r
}\r
else\r
- setToolTipText("");\r
+ setToolTipText(null);\r
}\r
}\r
\r
sequence.findPosition( findRes(evt) )\r
);\r
\r
- if(features!=null && features.length==1)\r
+ if(features!=null && features.length>0)\r
{\r
SearchResults highlight = new SearchResults();\r
highlight.addResult(sequence,\r
{\r
seqCanvas.getFeatureRenderer().amendFeatures(\r
new SequenceI[]\r
- {sequence}, features, false);\r
+ {sequence}, features, false, ap);\r
\r
seqCanvas.highlightSearchResults(null);\r
}\r
\r
if (stretchGroup.cs instanceof Blosum62ColourScheme\r
|| stretchGroup.cs instanceof PIDColourScheme\r
- || stretchGroup.cs.conservationApplied())\r
+ || stretchGroup.cs.conservationApplied()\r
+ || stretchGroup.cs.getThreshold()>0)\r
stretchGroup.recalcConservation();\r
\r
if (stretchGroup.cs.conservationApplied())\r