X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fappletgui%2FFeatureSettings.java;h=c855672df94480bebd68ab5c0803b0b34dc6349b;hb=d587f1aa61946dc14f6f089cf1dc2a3116cfb773;hp=f2f0943c083bae794d8a53e5eafc97d16e853e2b;hpb=7d36e036d2df33aa0c4fd12f55a822e9d6f17f50;p=jalview.git

diff --git a/src/jalview/appletgui/FeatureSettings.java b/src/jalview/appletgui/FeatureSettings.java
index f2f0943..c855672 100755
--- a/src/jalview/appletgui/FeatureSettings.java
+++ b/src/jalview/appletgui/FeatureSettings.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -38,10 +38,10 @@ public class FeatureSettings extends Panel implements ItemListener,
   Image linkImage;
   Scrollbar transparency ;
 
-  public FeatureSettings(AlignViewport av, final AlignmentPanel ap)
+  public FeatureSettings(final AlignmentPanel ap)
   {
     this.ap = ap;
-    this.av = av;
+    this.av = ap.av;
     fr = ap.seqPanel.seqCanvas.getFeatureRenderer();
 
     transparency = new Scrollbar(Scrollbar.HORIZONTAL,
@@ -104,9 +104,10 @@ public class FeatureSettings extends Panel implements ItemListener,
     }
     frame = new Frame();
     frame.add(this);
-    int height = featurePanel.getComponentCount()*50 +30;
+    int height = featurePanel.getComponentCount()*50 +60;
 
-    height = Math.max(100, height);
+
+    height = Math.max(200, height);
     height = Math.min(400, height);
 
     jalview.bin.JalviewLite.addFrame(frame, "Feature Settings", 280,
@@ -117,6 +118,8 @@ public class FeatureSettings extends Panel implements ItemListener,
   {
     g.setColor(Color.black);
     g.drawString("No Features added to this alignment!!", 10, 20);
+    g.drawString("(Features can be added from searches or", 10, 40);
+    g.drawString("from Jalview / GFF features files)", 10, 60);
   }
 
   void setTableData()
@@ -403,8 +406,9 @@ public class FeatureSettings extends Panel implements ItemListener,
 
     int height = evt.getY()+evt.getComponent().getLocation().y;
 
-    if(height > this.getSize().height)
+    if(height > featurePanel.getSize().height)
      {
+
        comp = featurePanel.getComponent(featurePanel.getComponentCount()-1);
      }
      else if(height < 0)
@@ -490,6 +494,7 @@ public class FeatureSettings extends Panel implements ItemListener,
     public MyCheckbox(String label, boolean checked, boolean haslink)
     {
       super(label, checked);
+
       FontMetrics fm = av.nullFrame.getFontMetrics(av.nullFrame.getFont());
       stringWidth = fm.stringWidth(label);
       this.hasLink = haslink;