idwidth is calculated in alignpanel, not idcanvas

diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java
index 9e64b1e..a526fb1 100755 (executable)
--- a/src/jalview/gui/IdCanvas.java
+++ b/src/jalview/gui/IdCanvas.java
@@ -36,7 +36,9 @@ public class IdCanvas extends JPanel
          gg.setColor(Color.black);\r
       }\r
 \r
-      String string = s.getName() + "/" + s.getStart() + "-" + s.getEnd();\r
+      String string = s.getName();\r
+      if(av.getShowFullId())\r
+        string = s.getDisplayId();\r
 \r
       gg.drawString(string,0,AlignmentUtil.getPixelHeight(starty,i,charHeight) + ypos + charHeight-   (charHeight/5));\r
 \r
@@ -45,7 +47,10 @@ public class IdCanvas extends JPanel
   public void paintComponent(Graphics gg) {\r
     AlignmentI al         = av.alignment;\r
     int        charHeight = av.charHeight;\r
-    gg.setFont(av.getFont());\r
+    Font italic = new Font(av.getFont().getName(), Font.ITALIC, av.getFont().getSize());\r
+\r
+    gg.setFont(italic);\r
+\r
 \r
     //Fill in the background\r
     gg.setColor(Color.white);\r
@@ -103,7 +108,9 @@ public class IdCanvas extends JPanel
                     charHeight);\r
 \r
         gg.setColor(currentTextColor);\r
-        String string = al.getSequenceAt(i).getDisplayId();\r
+        String string = al.getSequenceAt(i).getName();\r
+        if(av.getShowFullId())\r
+          string = al.getSequenceAt(i).getDisplayId();\r
         gg.drawString(string, 0,\r
                       AlignmentUtil.getPixelHeight(starty, i, charHeight) +\r
                       charHeight - (charHeight / 5));\r
@@ -111,35 +118,4 @@ public class IdCanvas extends JPanel
     }\r
 \r
   }\r
-\r
-\r
-  public Dimension getLabelWidth()\r
-  {\r
-    if(getGraphics()==null)\r
-      return null;\r
-\r
-   FontMetrics fm = this.getGraphics().getFontMetrics(av.font);\r
-   AlignmentI al = av.getAlignment();\r
-\r
-   int i   = 0;\r
-   int idWidth = 0;\r
-\r
-   while (i < al.getHeight() && al.getSequenceAt(i) != null)\r
-   {\r
-     SequenceI s   = al.getSequenceAt(i);\r
-     String str   = s.getDisplayId();\r
-     if (fm.stringWidth(str) > idWidth)\r
-       idWidth = fm.stringWidth(str);\r
-     i++;\r
-   }\r
-\r
-   return new Dimension(idWidth + 10,getHeight());\r
- }\r
-\r
- public Dimension getPreferredSize()\r
- {\r
-   return getLabelWidth();\r
- }\r
-\r
-\r
 }\r