Scroll cursor wrapped alignment

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

diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index 9b2f5f4..933ca04 100755 (executable)
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -235,25 +235,34 @@ public class SeqPanel extends JPanel implements MouseListener,
 \r
 \r
       endEditing();\r
-      while (seqCanvas.cursorY < av.startSeq)\r
+      if(av.wrapAlignment)\r
       {\r
-        ap.scrollUp(true);\r
+        ap.scrollToWrappedVisible(seqCanvas.cursorX);\r
       }\r
-      while (seqCanvas.cursorY + 1 > av.endSeq)\r
-      {\r
-        ap.scrollUp(false);\r
-      }\r
-      while (seqCanvas.cursorX < av.startRes)\r
-      {\r
-        if(!ap.scrollRight(false))\r
-          break;\r
-      }\r
-      while (seqCanvas.cursorX > av.endRes)\r
+      else\r
       {\r
-        if(!ap.scrollRight(true))\r
-          break;\r
+        while (seqCanvas.cursorY < av.startSeq)\r
+        {\r
+          ap.scrollUp(true);\r
+        }\r
+        while (seqCanvas.cursorY + 1 > av.endSeq)\r
+        {\r
+          ap.scrollUp(false);\r
+        }\r
+        if (!av.wrapAlignment)\r
+        {\r
+          while (seqCanvas.cursorX < av.startRes)\r
+          {\r
+            if (!ap.scrollRight(false))\r
+              break;\r
+          }\r
+          while (seqCanvas.cursorX > av.endRes)\r
+          {\r
+            if (!ap.scrollRight(true))\r
+              break;\r
+          }\r
+        }\r
       }\r
-\r
       setStatusMessage(av.alignment.getSequenceAt(seqCanvas.cursorY),\r
                        seqCanvas.cursorX, seqCanvas.cursorY);\r
 \r