Set size and location of frame before visible

[jalview.git] / src / jalview / gui / Desktop.java

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 498a6e6..a705386 100755 (executable)
--- 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()
             {