Must allow for scrollbar height

diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index cdff8a3..6cd18ba 100755 (executable)
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -81,8 +81,6 @@ public class AlignmentPanel
     annotationScroller.setViewportView(annotationPanel);\r
     annotationSpaceFillerHolder.add(alabels, BorderLayout.CENTER);\r
 \r
-    fontChanged();\r
-\r
     scalePanelHolder.add(scalePanel, BorderLayout.CENTER);\r
     seqPanelHolder.add(seqPanel, BorderLayout.CENTER);\r
 \r
@@ -109,7 +107,7 @@ public class AlignmentPanel
       }\r
     });\r
 \r
-    adjustAnnotationHeight();\r
+    fontChanged();\r
 \r
   }\r
 \r
@@ -298,16 +296,20 @@ public class AlignmentPanel
       System.out.println("NEEDS FIXING");\r
     }\r
 \r
-    int height = annotationPanel.adjustPanelHeight();\r
+    int height = annotationPanel.adjustPanelHeight() +\r
+        hscroll.getPreferredSize().height;\r
 \r
     if (height > alignFrame.getHeight() / 2)\r
     {\r
       height = alignFrame.getHeight() / 2;\r
     }\r
 \r
+    hscroll.addNotify();\r
+\r
     annotationScroller.setPreferredSize(\r
         new Dimension(annotationScroller.getWidth(),\r
-                      height));\r
+                      height + hscroll.getHeight()));\r
+\r
 \r
     annotationSpaceFillerHolder.setPreferredSize(new Dimension(\r
         annotationSpaceFillerHolder.getWidth(),\r