X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FAlignmentPanel.java;h=d912b2942dcdc86e7fbb909dc71940e4c8fd843f;hb=dd74fc4938723fe5ec48d4e5fdcfbe58ac42a48d;hp=0012ec4765e6141429592ef6541c287c6c5ffcf8;hpb=b149069ca631eb2e2c56c900ff4f490af1e98972;p=jalview.git

diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index 0012ec4..d912b29 100755
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -711,15 +711,14 @@ public class AlignmentPanel extends GAlignmentPanel
     Color currentColor = null;
     Color currentTextColor = null;
 
-    pg.setFont(new Font(av.getFont().getName(),
-                        Font.ITALIC,
-                        av.getFont().getSize()));
+    pg.setFont(idPanel.idCanvas.idfont);
+
     SequenceI seq;
     for (int i = startSeq; i < endSeq; i++)
     {
       seq = av.getAlignment().getSequenceAt(i);
       if ( (av.getSelectionGroup() != null) &&
-          av.getSelectionGroup().getSequences(false).contains(seq))
+          av.getSelectionGroup().getSequences(null).contains(seq))
       {
         currentColor = Color.gray;
         currentTextColor = Color.black;
@@ -736,8 +735,17 @@ public class AlignmentPanel extends GAlignmentPanel
 
       pg.setColor(currentTextColor);
 
+      int xPos = 0;
+      if (av.rightAlignIds)
+      {
+        fm = pg.getFontMetrics();
+        xPos = idWidth - fm.stringWidth(
+            seq.getDisplayId(av.getShowJVSuffix())
+            ) - 4;
+      }
+
       pg.drawString(seq.getDisplayId( av.getShowJVSuffix()),
-                    0,
+                    xPos,
                     ( ( (i - startSeq) * av.charHeight) + av.getCharHeight()) -
                     (av.getCharHeight() / 5));
     }
@@ -818,18 +826,23 @@ public class AlignmentPanel extends GAlignmentPanel
     pg.setClip(0, pi * pheight, pwidth, pheight);
 
     int ypos = hgap;
-    Font italic = new Font(av.getFont().getName(), Font.ITALIC,
-                           av.getFont().getSize());
-    pg.setFont(italic);
+
+
 
     do
     {
       for (int i = 0; i < av.alignment.getHeight(); i++)
       {
+        pg.setFont(idPanel.idCanvas.idfont);
         SequenceI s = av.alignment.getSequenceAt(i);
         String string = s.getDisplayId( av.getShowJVSuffix());
-
-        pg.drawString(string, 0,
+        int xPos = 0;
+        if (av.rightAlignIds)
+        {
+          FontMetrics fm = pg.getFontMetrics();
+          xPos = idWidth - fm.stringWidth( string ) - 4;
+        }
+        pg.drawString(string, xPos,
                       ( (i * av.charHeight) + ypos + av.charHeight) -
                       (av.charHeight / 5));
       }
@@ -841,7 +854,6 @@ public class AlignmentPanel extends GAlignmentPanel
 
         pg.setFont(av.getFont());
         labels.drawComponent(pg, idWidth);
-        pg.setFont(italic);
         pg.translate(+3,
                      -ypos -
                      (av.getAlignment().getHeight() * av.charHeight));
@@ -888,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();
@@ -1098,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(