From: amwaterhouse <Andrew Waterhouse>
Date: Fri, 23 Jun 2006 13:46:10 +0000 (+0000)
Subject: Case wrapped jar file, wrapped preference true dealt with
X-Git-Tag: Release_2_1~323
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=6a04c7bd4d21f8facf77a43f3bee6376f1c96c9d;p=jalview.git

Case wrapped jar file, wrapped preference true dealt with
---

diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index 67eaef8..c00f29f 100755
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -599,6 +599,7 @@ public class AlignmentPanel extends GAlignmentPanel
    */
   public void adjustmentValueChanged(AdjustmentEvent evt)
   {
+
     int oldX = av.getStartRes();
     int oldY = av.getStartSeq();
 
@@ -616,10 +617,26 @@ public class AlignmentPanel extends GAlignmentPanel
 
       if (av.getWrapAlignment())
       {
-        int rowSize = seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.
-            seqCanvas.getWidth());
-        av.setStartRes(vscroll.getValue() * rowSize);
-        av.setEndRes( (vscroll.getValue() + 1) * rowSize);
+        if(offy>-1)
+        {
+          int rowSize = seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.
+              seqCanvas.getWidth());
+          av.setStartRes(offy * rowSize);
+          av.setEndRes( (offy + 1) * rowSize);
+        }
+        else
+        {
+          //This is only called if file loaded is a jar file that
+          //was wrapped when saved and user has wrap alignment true
+          //as preference setting
+          SwingUtilities.invokeLater(new Runnable()
+              {
+                public void run()
+                {
+                  setScrollValues(av.getStartRes(), av.getStartSeq());
+                }
+              });
+        }
       }
       else
       {