new constructor for addtodesktop, sliders set to top layer

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index b2c86bb..331f882 100755 (executable)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -115,20 +115,27 @@ this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this));
     frame.setVisible(true);\r
 \r
   }\r
-\r
   public static void addInternalFrame(final JInternalFrame frame, String title, int w, int h)\r
   {\r
+    addInternalFrame(frame, title, w, h, true);\r
+  }\r
+\r
+  public static void addInternalFrame(final JInternalFrame frame, String title,\r
+                                      int w,\r
+                                      int h,\r
+                                      boolean resizable )\r
+  {\r
    desktop.add(frame);\r
    openFrameCount++;\r
    try {\r
        frame.setSelected(true);\r
    } catch (java.beans.PropertyVetoException e) {}\r
    frame.setTitle(title);\r
-   frame.setResizable(true);\r
    frame.setSize(w,h);\r
    frame.setClosable(true);\r
-   frame.setMaximizable(true);\r
-   frame.setIconifiable(true);\r
+   frame.setResizable(resizable);\r
+   frame.setMaximizable(resizable);\r
+   frame.setIconifiable(resizable);\r
    frame.setFrameIcon(null);\r
    frame.setLocation(xOffset*openFrameCount, yOffset*openFrameCount);\r
    frame.toFront();\r
@@ -206,7 +213,7 @@ this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this));
    if (sequences != null && sequences.length>0)\r
    {\r
      AlignFrame af = new AlignFrame(new Alignment(sequences));\r
-     addInternalFrame(af, file, 700, 500);\r
+     addInternalFrame(af, file, AlignFrame.NEW_WINDOW_WIDTH, AlignFrame.NEW_WINDOW_HEIGHT);\r
      af.statusBar.setText("Successfully loaded file " + file);\r
 \r
    }\r
@@ -262,7 +269,9 @@ this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this));
       if(sequences!=null)\r
       {\r
         AlignFrame af = new AlignFrame(new Alignment(sequences));\r
-        addInternalFrame(af, "Cut & Paste input - "+format, 700, 500);\r
+        addInternalFrame(af, "Cut & Paste input - "+format,\r
+                         AlignFrame.NEW_WINDOW_WIDTH,\r
+                         AlignFrame.NEW_WINDOW_HEIGHT);\r
         af.statusBar.setText("Successfully pasted alignment file");\r
       }\r
       else\r
@@ -332,9 +341,7 @@ this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this));
      sp = new SliderPanel(ap, value, true, cs);\r
      conservationSlider = new JInternalFrame();\r
      conservationSlider.setContentPane(sp);\r
-     addInternalFrame(conservationSlider, "Conservation Colour Increment  ("+source+")", 420, 90);\r
-     conservationSlider.setResizable(false);\r
-     conservationSlider.setMaximizable(false);\r
+     addInternalFrame(conservationSlider, "Conservation Colour Increment  ("+source+")", 420, 90, false);\r
      conservationSlider.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter()\r
                   {\r
                     public void internalFrameClosed(javax.swing.event.InternalFrameEvent e)\r
@@ -342,6 +349,7 @@ this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this));
                       conservationSlider = null;\r
                     }\r
                   });\r
+      conservationSlider.setLayer(JLayeredPane.PALETTE_LAYER);\r
    }\r
    else\r
    {\r
@@ -386,9 +394,8 @@ this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this));
      pid = new SliderPanel(ap, 50, false, cs);\r
      PIDSlider = new JInternalFrame();\r
      PIDSlider.setContentPane(pid);\r
-     addInternalFrame(PIDSlider, "Percentage Identity Threshold ("+source+")", 420, 90);\r
-     PIDSlider.setResizable(false);\r
-     PIDSlider.setMaximizable(false);\r
+     addInternalFrame(PIDSlider, "Percentage Identity Threshold ("+source+")", 420, 90, false);\r
+     PIDSlider.setLayer(JLayeredPane.PALETTE_LAYER);\r
    }\r
    else\r
    {\r