JAL-2491 sort of working overview/find interaction with split panels

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

diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index 4863659..4e5158d 100644 (file)
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -745,8 +745,8 @@ public class AlignmentPanel extends GAlignmentPanel implements
     }
 
     // update endRes after x has (possibly) been adjusted
-    vpRanges.setEndRes((x + (getSeqPanel().seqCanvas.getWidth() / av
-            .getCharWidth())) - 1);
+    // vpRanges.setEndRes((x + (getSeqPanel().seqCanvas.getWidth() / av
+    // .getCharWidth())) - 1);
 
     /*
      * each scroll adjustment triggers adjustmentValueChanged, which resets the
@@ -757,6 +757,7 @@ public class AlignmentPanel extends GAlignmentPanel implements
     hscroll.setValues(x, hextent, 0, width);
     // setDontScrollComplement(flag);
     vscroll.setValues(y, vextent, 0, height);
+
   }
 
   /**
@@ -771,7 +772,10 @@ public class AlignmentPanel extends GAlignmentPanel implements
     int oldX = vpRanges.getStartRes();
     int oldY = vpRanges.getStartSeq();
 
-    if (evt.getSource() == hscroll)
+    // check for horizontal scroll with wrapped alignment
+    // as this can happen via triggered events (and we don't want to hscroll
+    // when wrapped)
+    if (evt.getSource() == hscroll && !av.getWrapAlignment())
     {
       int x = hscroll.getValue();
       if (x == oldX)
@@ -1940,6 +1944,6 @@ public class AlignmentPanel extends GAlignmentPanel implements
     int x = vpRanges.getStartRes();
     int y = vpRanges.getStartSeq();
     setScrollValues(x, y);
-
+    av.scrollComplementaryAlignment();
   }
 }