JAL-2831 Don't show cursor if position in hidden region

[jalview.git] / src / jalview / gui / SeqCanvas.java

diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java
index d2f63a9..36ae682 100755 (executable)
--- a/src/jalview/gui/SeqCanvas.java
+++ b/src/jalview/gui/SeqCanvas.java
@@ -413,8 +413,12 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
       g.drawImage(lcimg, 0, 0, this);
 
     }
-    drawCursor(g, ranges.getStartRes(), ranges.getEndRes(),
-            ranges.getStartSeq(), ranges.getEndSeq());
+
+    if (av.cursorMode)
+    {
+      drawCursor(g, ranges.getStartRes(), ranges.getEndRes(),
+              ranges.getStartSeq(), ranges.getEndSeq());
+    }
   }
   
   /**
@@ -1266,7 +1270,8 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
             .findIndexWithoutHiddenSeqs(cursorY);
 
     // don't do work unless we have to
-    if (av.cursorMode && cursor_ypos >= startSeq && cursor_ypos <= endSeq)
+    if (!av.getAlignment().getHiddenSequences().isHidden(cursorY)
+            && cursor_ypos >= startSeq && cursor_ypos <= endSeq)
     {
       int yoffset = 0;
       int xoffset = 0;
@@ -1277,53 +1282,56 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
       int cursor_xpos = av.getAlignment().getHiddenColumns()
               .findColumnPosition(cursorX);
 
-      if (av.getWrapAlignment())
+      if (av.getAlignment().getHiddenColumns().isVisible(cursorX))
       {
-        // work out the correct offsets for the cursor
-        int charHeight = av.getCharHeight();
-        int charWidth = av.getCharWidth();
-        int canvasWidth = getWidth();
-        int canvasHeight = getHeight();
 
-        // height gap above each panel
-        int hgap = charHeight;
-        if (av.getScaleAboveWrapped())
+        if (av.getWrapAlignment())
         {
-          hgap += charHeight;
-        }
+          // work out the correct offsets for the cursor
+          int charHeight = av.getCharHeight();
+          int charWidth = av.getCharWidth();
+          int canvasWidth = getWidth();
+          int canvasHeight = getHeight();
+
+          // height gap above each panel
+          int hgap = charHeight;
+          if (av.getScaleAboveWrapped())
+          {
+            hgap += charHeight;
+          }
 
-        int cWidth = (canvasWidth - labelWidthEast - labelWidthWest)
-                / charWidth;
-        int cHeight = av.getAlignment().getHeight() * charHeight;
+          int cWidth = (canvasWidth - labelWidthEast - labelWidthWest)
+                  / charWidth;
+          int cHeight = av.getAlignment().getHeight() * charHeight;
 
-        endx = startx + cWidth - 1;
-        int ypos = hgap; // vertical offset
+          endx = startx + cWidth - 1;
+          int ypos = hgap; // vertical offset
 
-        // iterate down the wrapped panels
-        while ((ypos <= canvasHeight) && (endx < cursor_xpos))
-        {
-          // update vertical offset
-          ypos += cHeight + getAnnotationHeight() + hgap;
+          // iterate down the wrapped panels
+          while ((ypos <= canvasHeight) && (endx < cursor_xpos))
+          {
+            // update vertical offset
+            ypos += cHeight + getAnnotationHeight() + hgap;
 
-          // update horizontal offset
-          startx += cWidth;
-          endx = startx + cWidth - 1;
+            // update horizontal offset
+            startx += cWidth;
+            endx = startx + cWidth - 1;
+          }
+          yoffset = ypos;
+          xoffset = labelWidthWest;
         }
-        yoffset = ypos;
-        xoffset = labelWidthWest;
-      }
 
-      // now check if cursor is within range for x values
-      if (cursor_xpos >= startx && cursor_xpos <= endx)
-      {
-        // get the character the cursor is drawn at
-        SequenceI seq = av.getAlignment().getSequenceAt(cursorY);
-        char s = seq.getCharAt(cursorX);
-
-        seqRdr.drawCursor(g, s,
-                xoffset + (cursor_xpos - startx) * av.getCharWidth(),
-                yoffset + (cursor_ypos - startSeq) * av.getCharHeight());
-        g.dispose();
+        // now check if cursor is within range for x values
+        if (cursor_xpos >= startx && cursor_xpos <= endx)
+        {
+          // get the character the cursor is drawn at
+          SequenceI seq = av.getAlignment().getSequenceAt(cursorY);
+          char s = seq.getCharAt(cursorX);
+
+          seqRdr.drawCursor(g, s,
+                  xoffset + (cursor_xpos - startx) * av.getCharWidth(),
+                  yoffset + (cursor_ypos - startSeq) * av.getCharHeight());
+        }
       }
     }
   }