JAL-2491 Started moving other scrolling fns into viewportranges

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

diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index ce434f5..82d98c0 100644 (file)
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -383,37 +383,37 @@ public class SeqPanel extends JPanel implements MouseListener,
     endEditing();
     if (av.getWrapAlignment())
     {
-      ap.scrollToWrappedVisible(seqCanvas.cursorX);
+      av.getRanges().scrollToWrappedVisible(seqCanvas.cursorX);
+      // ap.scrollToWrappedVisible(seqCanvas.cursorX);
     }
     else
     {
       while (seqCanvas.cursorY < av.getRanges().getStartSeq())
       {
-        ap.scrollUp(true);
+        av.getRanges().scrollUp(true);
       }
       while (seqCanvas.cursorY + 1 > av.getRanges().getEndSeq())
       {
-        ap.scrollUp(false);
+        av.getRanges().scrollUp(false);
       }
-      if (!av.getWrapAlignment())
+
+      while (seqCanvas.cursorX < av.getColumnSelection()
+              .adjustForHiddenColumns(av.getRanges().getStartRes()))
       {
-        while (seqCanvas.cursorX < av.getColumnSelection()
-                .adjustForHiddenColumns(av.getRanges().getStartRes()))
+        if (!av.getRanges().scrollRight(false))
         {
-          if (!ap.scrollRight(false))
-          {
-            break;
-          }
+          break;
         }
-        while (seqCanvas.cursorX > av.getColumnSelection()
-                .adjustForHiddenColumns(av.getRanges().getEndRes()))
+      }
+      while (seqCanvas.cursorX > av.getColumnSelection()
+              .adjustForHiddenColumns(av.getRanges().getEndRes()))
+      {
+        if (!av.getRanges().scrollRight(true))
         {
-          if (!ap.scrollRight(true))
-          {
-            break;
-          }
+          break;
         }
       }
+
     }
     setStatusMessage(av.getAlignment().getSequenceAt(seqCanvas.cursorY),
             seqCanvas.cursorX, seqCanvas.cursorY);
@@ -1522,23 +1522,23 @@ public class SeqPanel extends JPanel implements MouseListener,
     {
       if (e.isShiftDown())
       {
-        ap.scrollRight(true);
+        av.getRanges().scrollRight(true);
 
       }
       else
       {
-        ap.scrollUp(false);
+        av.getRanges().scrollUp(false);
       }
     }
     else
     {
       if (e.isShiftDown())
       {
-        ap.scrollRight(false);
+        av.getRanges().scrollRight(false);
       }
       else
       {
-        ap.scrollUp(true);
+        av.getRanges().scrollUp(true);
       }
     }
     // TODO Update tooltip for new position.
@@ -1906,23 +1906,23 @@ public class SeqPanel extends JPanel implements MouseListener,
           if (mouseDragging && (evt.getY() < 0)
                   && (av.getRanges().getStartSeq() > 0))
           {
-            running = ap.scrollUp(true);
+            running = av.getRanges().scrollUp(true);
           }
 
           if (mouseDragging && (evt.getY() >= getHeight())
                   && (av.getAlignment().getHeight() > av.getRanges()
                           .getEndSeq()))
           {
-            running = ap.scrollUp(false);
+            running = av.getRanges().scrollUp(false);
           }
 
           if (mouseDragging && (evt.getX() < 0))
           {
-            running = ap.scrollRight(false);
+            running = av.getRanges().scrollRight(false);
           }
           else if (mouseDragging && (evt.getX() >= getWidth()))
           {
-            running = ap.scrollRight(true);
+            running = av.getRanges().scrollRight(true);
           }
         }