Wrap alignment with annotations

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

diff --git a/src/jalview/appletgui/AlignmentPanel.java b/src/jalview/appletgui/AlignmentPanel.java
index cf383ac..7332a1a 100755 (executable)
--- a/src/jalview/appletgui/AlignmentPanel.java
+++ b/src/jalview/appletgui/AlignmentPanel.java
@@ -22,10 +22,8 @@ package jalview.appletgui;
 import java.awt.*;\r
 import java.awt.event.*;\r
 \r
-import jalview.analysis.*;\r
 import jalview.datamodel.*;\r
 import jalview.jbappletgui.*;\r
-import jalview.schemes.*;\r
 \r
 public class AlignmentPanel\r
     extends GAlignmentPanel implements AdjustmentListener\r
@@ -274,8 +272,11 @@ public class AlignmentPanel
 \r
   public void setAnnotationVisible(boolean b)\r
   {\r
-    annotationSpaceFillerHolder.setVisible(b);\r
-    annotationScroller.setVisible(b);\r
+    if (!av.wrapAlignment)\r
+    {\r
+      annotationSpaceFillerHolder.setVisible(b);\r
+      annotationScroller.setVisible(b);\r
+    }\r
     validate();\r
     repaint();\r
   }\r
@@ -287,9 +288,17 @@ public class AlignmentPanel
     hscroll.setVisible(!wrap);\r
     idwidthAdjuster.setVisible(!wrap);\r
 \r
-    av.setShowAnnotation(!wrap);\r
-    annotationScroller.setVisible(!wrap);\r
-    annotationSpaceFillerHolder.setVisible(!wrap);\r
+    if (wrap)\r
+    {\r
+      annotationScroller.setVisible(false);\r
+      annotationSpaceFillerHolder.setVisible(false);\r
+    }\r
+    else if (av.showAnnotation)\r
+    {\r
+      annotationScroller.setVisible(true);\r
+      annotationSpaceFillerHolder.setVisible(true);\r
+    }\r
+\r
     idSpaceFillerPanel1.setVisible(!wrap);\r
 \r
     validate();\r