From b9fa0041e8f04f85f4f5357d2e2fe07e74d2172d Mon Sep 17 00:00:00 2001 From: amwaterhouse Date: Mon, 15 May 2006 13:28:07 +0000 Subject: [PATCH] If headless, get the width of Jalview wrapped window correct --- src/jalview/gui/AlignmentPanel.java | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java index 364be5d..6d4e226 100755 --- a/src/jalview/gui/AlignmentPanel.java +++ b/src/jalview/gui/AlignmentPanel.java @@ -943,7 +943,6 @@ public class AlignmentPanel extends GAlignmentPanel { int height = ( (av.alignment.getHeight() + 1) * av.charHeight) + 30; int width = idPanel.getWidth() + (av.alignment.getWidth() * av.charWidth); - if (idPanel.getWidth() == 0) { width += calculateIdWidth().getWidth() + 4; @@ -952,7 +951,15 @@ public class AlignmentPanel extends GAlignmentPanel if (av.getWrapAlignment()) { height = getWrappedHeight(); - width = seqPanel.getWidth() + idPanel.getWidth(); + if (System.getProperty("java.awt.headless") != null + && System.getProperty("java.awt.headless").equals("true")) + { + width = alignFrame.getWidth() - 22; + } + else + + width = seqPanel.getWidth() + idPanel.getWidth(); + } else if (av.getShowAnnotation()) { @@ -1155,9 +1162,19 @@ public class AlignmentPanel extends GAlignmentPanel int getWrappedHeight() { + 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")) + { + int idWidth = calculateIdWidth().width + 4; + seqPanelWidth = alignFrame.getWidth() - idWidth; + } int chunkWidth = seqPanel.seqCanvas.getWrappedCanvasWidth( - seqPanel.seqCanvas.getWidth()); + seqPanelWidth + ); int hgap = av.charHeight; if (av.scaleAboveWrapped) -- 1.7.10.2