X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignmentPanel.java;h=d912b2942dcdc86e7fbb909dc71940e4c8fd843f;hb=dd74fc4938723fe5ec48d4e5fdcfbe58ac42a48d;hp=4a217811f55fdab4c723d8cdfa13daeaa2f8a3b1;hpb=3b20f512421e707431c326189dbf7d8755968baa;p=jalview.git

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