X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fappletgui%2FSeqPanel.java;h=feda6970dafd2aaf6cbf6b4acc620298514da0d1;hb=2e699d341f8e64868e3c279f9c02af617c4e9b44;hp=8e70e35dbabe3e213ce0dfd303a4abbcad8794ae;hpb=3e3378e2ccfea39a2b161600c5a2029716acd1b7;p=jalview.git

diff --git a/src/jalview/appletgui/SeqPanel.java b/src/jalview/appletgui/SeqPanel.java
index 8e70e35..feda697 100755
--- a/src/jalview/appletgui/SeqPanel.java
+++ b/src/jalview/appletgui/SeqPanel.java
@@ -138,6 +138,24 @@ public class SeqPanel
    {
      seqCanvas.cursorX += dx;
      seqCanvas.cursorY += dy;
+     if (av.hasHiddenColumns && !av.colSel.isVisible(seqCanvas.cursorX))
+     {
+       int original = seqCanvas.cursorX - dx;
+       int maxWidth = av.alignment.getWidth();
+
+       while(!av.colSel.isVisible(seqCanvas.cursorX)
+             && seqCanvas.cursorX<maxWidth
+             && seqCanvas.cursorX>0)
+       {
+         seqCanvas.cursorX += dx;
+       }
+
+       if(seqCanvas.cursorX>=maxWidth
+          || !av.colSel.isVisible(seqCanvas.cursorX) )
+       {
+         seqCanvas.cursorX = original;
+       }
+      }
      scrollToVisible();
    }
 
@@ -169,13 +187,13 @@ public class SeqPanel
        {
          ap.scrollUp(false);
        }
-       while (seqCanvas.cursorX < av.startRes)
+       while (seqCanvas.cursorX < av.colSel.adjustForHiddenColumns(av.startRes))
        {
 
          if (!ap.scrollRight(false))
            break;
        }
-       while (seqCanvas.cursorX > av.endRes)
+       while (seqCanvas.cursorX > av.colSel.adjustForHiddenColumns(av.endRes))
        {
          if (!ap.scrollRight(true))
            break;