Merge branch 'bug/JAL-2634' into develop

[jalview.git] / src / jalview / appletgui / AlignmentPanel.java

diff --git a/src/jalview/appletgui/AlignmentPanel.java b/src/jalview/appletgui/AlignmentPanel.java
index f8f31b2..d679217 100644 (file)
--- a/src/jalview/appletgui/AlignmentPanel.java
+++ b/src/jalview/appletgui/AlignmentPanel.java
@@ -643,7 +643,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
 
   public void setWrapAlignment(boolean wrap)
   {
-    vpRanges.setStartSeq(0);
+    vpRanges.setStartEndSeq(0, vpRanges.getVisibleAlignmentHeight());
     vpRanges.setStartRes(0);
     scalePanelHolder.setVisible(!wrap);
 
@@ -817,14 +817,14 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
       {
         return;
       }
-      else if (newY > -1)
+      if (newY > -1)
       {
         /*
          * limit page up/down to one width's worth of positions
          */
         int rowSize = vpRanges.getViewportWidth();
         int newX = newY > oldY ? oldX + rowSize : oldX - rowSize;
-        vpRanges.setViewportStartAndWidth(newX, rowSize);
+        vpRanges.setViewportStartAndWidth(Math.max(0, newX), rowSize);
       }
     }
     else