From: amwaterhouse <Andrew Waterhouse>
Date: Tue, 23 Aug 2005 10:10:31 +0000 (+0000)
Subject: Set size and location of frame before visible
X-Git-Tag: Release_2_04~17
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=96589f3091facee1b50db52995b3a13425f0e96b;p=jalview.git

Set size and location of frame before visible
---

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 692f258..c1d383e 100755
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -2111,6 +2111,11 @@ public class AlignFrame
     }
   }
 
+
+  public TreePanel ShowNewickTree(NewickFile nf, String title)
+  {
+    return ShowNewickTree(nf,title,600,500,4,5);
+  }
   /**
    * DOCUMENT ME!
    *
@@ -2119,7 +2124,7 @@ public class AlignFrame
    *
    * @return DOCUMENT ME!
    */
-  public TreePanel ShowNewickTree(NewickFile nf, String title)
+  public TreePanel ShowNewickTree(NewickFile nf, String title, int w,int h,int x, int y)
   {
     TreePanel tp = null;
 
@@ -2133,7 +2138,14 @@ public class AlignFrame
                            viewport.getAlignment().getSequences(), nf,
                            "FromFile",
                            title);
-        Desktop.addInternalFrame(tp, title, 600, 500);
+
+        tp.setSize(w,h);
+
+        if(x>0 && y>0)
+          tp.setLocation(x,y);
+
+
+        Desktop.addInternalFrame(tp, title, w, h);
         addTreeMenuItem(tp, title);
       }
     }
diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 498a6e6..a705386 100755
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -113,10 +113,11 @@ public class Desktop extends jalview.jbgui.GDesktop
         SplashScreen splash = new SplashScreen(frame, image);
         frame.setContentPane(splash);
         frame.setLayer(JLayeredPane.PALETTE_LAYER);
-        addInternalFrame(frame, "", 750, 160, false);
         frame.setLocation((int) ((getWidth() - 750) / 2),
             (int) ((getHeight() - 160) / 2));
-      discoverer=new jalview.ws.Discoverer(); // Only gets started if gui is displayed.
+        addInternalFrame(frame, "", 750, 160, false);
+
+        discoverer=new jalview.ws.Discoverer(); // Only gets started if gui is displayed.
     }
 
     /**
@@ -147,10 +148,10 @@ public class Desktop extends jalview.jbgui.GDesktop
     {
 
       frame.setTitle(title);
-      if(w!=AlignFrame.NEW_WINDOW_WIDTH &&
-        h!=AlignFrame.NEW_WINDOW_HEIGHT)
-       frame.setSize(w, h);
-
+      if(frame.getWidth()<1 || frame.getHeight()<1)
+      {
+        frame.setSize(w, h);
+      }
       // THIS IS A PUBLIC STATIC METHOD, SO IT MAY BE CALLED EVEN IN
       // A HEADLESS STATE WHEN NO DESKTOP EXISTS. MUST RETURN
       // IF JALVIEW IS RUNNING HEADLESS
@@ -178,11 +179,13 @@ public class Desktop extends jalview.jbgui.GDesktop
         frame.setMaximizable(resizable);
         frame.setIconifiable(resizable);
         frame.setFrameIcon(null);
-        if (w != AlignFrame.NEW_WINDOW_WIDTH &&
-            h != AlignFrame.NEW_WINDOW_HEIGHT)
-          frame.setLocation(xOffset * openFrameCount, yOffset * openFrameCount);
-        frame.toFront();
 
+        if (frame.getX()<1 && frame.getY()<1)
+       {
+         frame.setLocation(xOffset * openFrameCount, yOffset * (openFrameCount%10)+yOffset);
+       }
+
+        frame.toFront();
         final JMenuItem menuItem = new JMenuItem(title);
         frame.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter()
             {
diff --git a/src/jalview/gui/Jalview2XML.java b/src/jalview/gui/Jalview2XML.java
index ffa837d..7018ef0 100755
--- a/src/jalview/gui/Jalview2XML.java
+++ b/src/jalview/gui/Jalview2XML.java
@@ -762,13 +762,13 @@ public class Jalview2XML
             {
                 for (int t = 0; t < jms.getTreeCount(); t++)
                 {
+
                     Tree tree = jms.getTree(t);
 
                     TreePanel tp = af.ShowNewickTree(new jalview.io.NewickFile(
-                                tree.getNewick()), tree.getTitle());
-
-                    tp.setBounds(tree.getXpos(), tree.getYpos(),
-                        tree.getWidth(), tree.getHeight());
+                                tree.getNewick()), tree.getTitle(),
+                                tree.getWidth(), tree.getHeight(),
+                                tree.getXpos(), tree.getYpos());
 
                     tp.fitToWindow.setState(tree.getFitToWindow());
                     tp.fitToWindow_actionPerformed(null);
@@ -795,7 +795,7 @@ public class Jalview2XML
         }
 
         Desktop.addInternalFrame(af, view.getTitle(),
-             AlignFrame.NEW_WINDOW_WIDTH, AlignFrame.NEW_WINDOW_HEIGHT);
+             view.getWidth(), view.getHeight());
 
         return af;
     }