formatting

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

diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index 4a21781..d912b29 100755 (executable)
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -839,7 +839,7 @@ public class AlignmentPanel extends GAlignmentPanel
         int xPos = 0;\r
         if (av.rightAlignIds)\r
         {\r
-          FontMetrics fm = getFontMetrics(idPanel.idCanvas.idfont);\r
+          FontMetrics fm = pg.getFontMetrics();\r
           xPos = idWidth - fm.stringWidth( string ) - 4;\r
         }\r
         pg.drawString(string, xPos,\r
@@ -900,7 +900,10 @@ public class AlignmentPanel extends GAlignmentPanel
       if (System.getProperty("java.awt.headless") != null\r
           && System.getProperty("java.awt.headless").equals("true"))\r
       {\r
-        width = alignFrame.getWidth() - 22;\r
+        width = alignFrame.getWidth()\r
+            - vscroll.getPreferredSize().width\r
+            - alignFrame.getInsets().left\r
+            - alignFrame.getInsets().right;\r
       }\r
       else\r
         width = seqPanel.getWidth() + getVisibleIdWidth();\r
@@ -1110,11 +1113,14 @@ public class AlignmentPanel extends GAlignmentPanel
   {\r
     int seqPanelWidth = seqPanel.seqCanvas.getWidth();\r
 \r
-    //If headless, seqPanel will have 0 width\r
     if (System.getProperty("java.awt.headless") != null\r
-              && System.getProperty("java.awt.headless").equals("true"))\r
+        && System.getProperty("java.awt.headless").equals("true"))\r
     {\r
-      seqPanelWidth = alignFrame.getWidth() - getVisibleIdWidth();\r
+      seqPanelWidth = alignFrame.getWidth()\r
+          - getVisibleIdWidth()\r
+          - vscroll.getPreferredSize().width\r
+          - alignFrame.getInsets().left\r
+          - alignFrame.getInsets().right;\r
     }\r
 \r
     int chunkWidth = seqPanel.seqCanvas.getWrappedCanvasWidth(\r