git://source.jalview.org / jalview.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Dont change ap font from treePanel
[jalview.git] / src / jalview / gui / SeqPanel.java
diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index 4ea3a12..bc9adfe 100755 (executable)
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -286,6 +286,25 @@ public class SeqPanel extends JPanel implements MouseListener,
     {\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
@@ -319,12 +338,12 @@ public class SeqPanel extends JPanel implements MouseListener,
         }\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
@@ -650,8 +669,7 @@ public class SeqPanel extends JPanel implements MouseListener,
 \r
               if(tooltipText.length()==6) // <html></html>\r
               {\r
-\r
-                setToolTipText("");\r
+                setToolTipText(null);\r
               }\r
               else\r
               {\r
@@ -660,7 +678,7 @@ public class SeqPanel extends JPanel implements MouseListener,
               }\r
             }\r
             else\r
-              setToolTipText("");\r
+              setToolTipText(null);\r
         }\r
     }\r
 \r
@@ -1213,7 +1231,7 @@ public class SeqPanel extends JPanel implements MouseListener,
             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
@@ -1225,7 +1243,7 @@ public class SeqPanel extends JPanel implements MouseListener,
         {\r
           seqCanvas.getFeatureRenderer().amendFeatures(\r
               new SequenceI[]\r
-              {sequence}, features, false);\r
+              {sequence}, features, false, ap);\r
 \r
           seqCanvas.highlightSearchResults(null);\r
         }\r