JAL-2069 spike updated with latest (FeatureTypeSettings)

[jalview.git] / src / jalview / viewmodel / OverviewDimensionsShowHidden.java

diff --git a/src/jalview/viewmodel/OverviewDimensionsShowHidden.java b/src/jalview/viewmodel/OverviewDimensionsShowHidden.java
index 5bd4bba..9dde16e 100644 (file)
--- a/src/jalview/viewmodel/OverviewDimensionsShowHidden.java
+++ b/src/jalview/viewmodel/OverviewDimensionsShowHidden.java
@@ -104,9 +104,7 @@ public class OverviewDimensionsShowHidden extends OverviewDimensions
     int visYAsRes = hiddenSeqs.findIndexWithoutHiddenSeqs(vpy) + ydiff;
 
     // update viewport accordingly
-    updateViewportFromTopLeft(visXAsRes, visYAsRes,
-            hiddenSeqs,
-            hiddenCols);
+    updateViewportFromTopLeft(visXAsRes, visYAsRes, hiddenSeqs, hiddenCols);
   }
 
   @Override
@@ -127,6 +125,11 @@ public class OverviewDimensionsShowHidden extends OverviewDimensions
       visYAsSeq = 0;
     }
 
+    if (ranges.isWrappedMode())
+    {
+      visYAsSeq = 0; // sorry, no vertical scroll when wrapped
+    }
+
     // Determine where scrollCol should be, given visXAsRes
 
     // get viewport width in residues
@@ -163,8 +166,8 @@ public class OverviewDimensionsShowHidden extends OverviewDimensions
       // went past the end of the alignment, adjust backwards
       if (ranges.getEndSeq() < visAlignHeight)
       {
-        visYAsSeq = hiddenSeqs.findIndexWithoutHiddenSeqs(hiddenSeqs
-                .subtractVisibleRows(vpheight - 1, alheight - 1));
+        visYAsSeq = hiddenSeqs.findIndexWithoutHiddenSeqs(
+                hiddenSeqs.subtractVisibleRows(vpheight - 1, alheight - 1));
       }
       else
       {
@@ -173,8 +176,7 @@ public class OverviewDimensionsShowHidden extends OverviewDimensions
     }
 
     // update viewport
-    ranges.setStartRes(visXAsRes);
-    ranges.setStartSeq(visYAsSeq);
+    ranges.setStartResAndSeq(visXAsRes, visYAsSeq);
   }
 
   /**
@@ -200,22 +202,21 @@ public class OverviewDimensionsShowHidden extends OverviewDimensions
     int startSeq = hiddenSeqs.adjustForHiddenSeqs(ranges.getStartSeq());
     int endSeq = hiddenSeqs.adjustForHiddenSeqs(ranges.getEndSeq());
 
-    setBoxPosition(startRes, startSeq, endRes - startRes + 1, endSeq
-            - startSeq + 1);
+    setBoxPosition(startRes, startSeq, endRes - startRes + 1,
+            endSeq - startSeq + 1);
   }
 
   @Override
   public AlignmentColsCollectionI getColumns(AlignmentI al)
   {
-    return new AllColsCollection(0,
-            ranges.getAbsoluteAlignmentWidth() - 1, al);
+    return new AllColsCollection(0, ranges.getAbsoluteAlignmentWidth() - 1,
+            al);
   }
 
   @Override
   public AlignmentRowsCollectionI getRows(AlignmentI al)
   {
-    return new AllRowsCollection(0,
-            ranges.getAbsoluteAlignmentHeight() - 1,
+    return new AllRowsCollection(0, ranges.getAbsoluteAlignmentHeight() - 1,
             al);
   }