scale above, left right added

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

diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index c38b7dc..73cee2d 100755 (executable)
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -225,8 +225,13 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
     annotationScroller.setVisible(!wrap);\r
     annotationSpaceFillerHolder.setVisible(!wrap);\r
     idSpaceFillerPanel1.setVisible(!wrap);\r
-\r
-    RefreshPanels();\r
+    javax.swing.SwingUtilities.invokeLater(new Runnable()\r
+     {\r
+       public void run()\r
+       {\r
+         RefreshPanels();\r
+       }\r
+    });\r
 \r
   }\r
 \r
@@ -266,8 +271,7 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
 \r
     if (av.getWrapAlignment())\r
     {\r
-      int max = av.alignment.getWidth() /\r
-          (seqPanel.seqCanvas.getWidth() / av.charWidth) + 1;\r
+      int max = av.alignment.getWidth() / seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getWidth());\r
       vscroll.setValues(0, 1, 0, max);\r
     }\r
     else\r
@@ -372,7 +376,9 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
       int offy = vscroll.getValue();\r
       if (av.getWrapAlignment())\r
       {\r
-        av.setStartRes( vscroll.getValue() * av.getChunkWidth());\r
+        int rowSize = seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getWidth());\r
+        av.setStartRes( vscroll.getValue() * rowSize );\r
+        av.setEndRes( (vscroll.getValue()+1) * rowSize );\r
       }\r
       else\r
       {\r