If headless, get the width of Jalview wrapped window correct

diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index 364be5d..6d4e226 100755 (executable)
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -943,7 +943,6 @@ public class AlignmentPanel extends GAlignmentPanel
   {\r
     int height = ( (av.alignment.getHeight() + 1) * av.charHeight) + 30;\r
     int width = idPanel.getWidth() + (av.alignment.getWidth() * av.charWidth);\r
-\r
     if (idPanel.getWidth() == 0)\r
     {\r
       width += calculateIdWidth().getWidth() + 4;\r
@@ -952,7 +951,15 @@ public class AlignmentPanel extends GAlignmentPanel
     if (av.getWrapAlignment())\r
     {\r
       height = getWrappedHeight();\r
-      width = seqPanel.getWidth() + idPanel.getWidth();\r
+      if (System.getProperty("java.awt.headless") != null\r
+          && System.getProperty("java.awt.headless").equals("true"))\r
+      {\r
+        width = alignFrame.getWidth() - 22;\r
+      }\r
+      else\r
+\r
+        width = seqPanel.getWidth() + idPanel.getWidth();\r
+\r
     }\r
     else if (av.getShowAnnotation())\r
     {\r
@@ -1155,9 +1162,19 @@ public class AlignmentPanel extends GAlignmentPanel
 \r
   int getWrappedHeight()\r
   {\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
+    {\r
+      int idWidth = calculateIdWidth().width + 4;\r
+      seqPanelWidth = alignFrame.getWidth() - idWidth;\r
+    }\r
 \r
     int chunkWidth = seqPanel.seqCanvas.getWrappedCanvasWidth(\r
-        seqPanel.seqCanvas.getWidth());\r
+        seqPanelWidth\r
+          );\r
 \r
     int hgap = av.charHeight;\r
     if (av.scaleAboveWrapped)\r