minor formatting of tooltip

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

diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index 6cd18ba..b11838c 100755 (executable)
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -108,6 +108,7 @@ public class AlignmentPanel
     });\r
 \r
     fontChanged();\r
+    adjustAnnotationHeight();\r
 \r
   }\r
 \r
@@ -115,14 +116,10 @@ public class AlignmentPanel
   {\r
     av.alignmentChanged(this);\r
 \r
-    if (overviewPanel != null)\r
-    {\r
-      overviewPanel.updateOverviewImage();\r
-    }\r
-\r
     alignFrame.updateEditMenuBar();\r
 \r
-    repaint();\r
+    paintAlignment(true);\r
+\r
   }\r
 \r
   /**\r
@@ -241,6 +238,8 @@ public class AlignmentPanel
         scrollToWrappedVisible(start);\r
       }\r
     }\r
+\r
+    paintAlignment(true);\r
   }\r
 \r
   void scrollToWrappedVisible(int res)\r
@@ -296,9 +295,12 @@ public class AlignmentPanel
       System.out.println("NEEDS FIXING");\r
     }\r
 \r
-    int height = annotationPanel.adjustPanelHeight() +\r
-        hscroll.getPreferredSize().height;\r
+    int height = annotationPanel.adjustPanelHeight();\r
 \r
+    if (hscroll.isVisible())\r
+    {\r
+      height += hscroll.getPreferredSize().height;\r
+    }\r
     if (height > alignFrame.getHeight() / 2)\r
     {\r
       height = alignFrame.getHeight() / 2;\r
@@ -307,8 +309,7 @@ public class AlignmentPanel
     hscroll.addNotify();\r
 \r
     annotationScroller.setPreferredSize(\r
-        new Dimension(annotationScroller.getWidth(),\r
-                      height + hscroll.getHeight()));\r
+        new Dimension(annotationScroller.getWidth(), height));\r
 \r
 \r
     annotationSpaceFillerHolder.setPreferredSize(new Dimension(\r
@@ -917,7 +918,8 @@ public class AlignmentPanel
       maxwidth = av.getColumnSelection().findColumnPosition(maxwidth);\r
     }\r
 \r
-    int height = ( (av.alignment.getHeight() + 1) * av.charHeight) + 30;\r
+    int height = ( (av.alignment.getHeight() + 1) * av.charHeight)\r
+        + scalePanel.getHeight();\r
     int width = getVisibleIdWidth() + (maxwidth * av.charWidth);\r
 \r
     if (av.getWrapAlignment())\r