From 8a0324e8daa7840423e9aeb3a5020e15038014b8 Mon Sep 17 00:00:00 2001 From: amwaterhouse Date: Wed, 13 Apr 2005 16:34:03 +0000 Subject: [PATCH] new constructor for addtodesktop, sliders set to top layer --- src/jalview/gui/Desktop.java | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java index b2c86bb..331f882 100755 --- 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); } - public static void addInternalFrame(final JInternalFrame frame, String title, int w, int h) { + addInternalFrame(frame, title, w, h, true); + } + + public static void addInternalFrame(final JInternalFrame frame, String title, + int w, + int h, + boolean resizable ) + { desktop.add(frame); openFrameCount++; try { frame.setSelected(true); } catch (java.beans.PropertyVetoException e) {} frame.setTitle(title); - frame.setResizable(true); frame.setSize(w,h); frame.setClosable(true); - frame.setMaximizable(true); - frame.setIconifiable(true); + frame.setResizable(resizable); + frame.setMaximizable(resizable); + frame.setIconifiable(resizable); frame.setFrameIcon(null); frame.setLocation(xOffset*openFrameCount, yOffset*openFrameCount); frame.toFront(); @@ -206,7 +213,7 @@ this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this)); if (sequences != null && sequences.length>0) { AlignFrame af = new AlignFrame(new Alignment(sequences)); - addInternalFrame(af, file, 700, 500); + addInternalFrame(af, file, AlignFrame.NEW_WINDOW_WIDTH, AlignFrame.NEW_WINDOW_HEIGHT); af.statusBar.setText("Successfully loaded file " + file); } @@ -262,7 +269,9 @@ this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this)); if(sequences!=null) { AlignFrame af = new AlignFrame(new Alignment(sequences)); - addInternalFrame(af, "Cut & Paste input - "+format, 700, 500); + addInternalFrame(af, "Cut & Paste input - "+format, + AlignFrame.NEW_WINDOW_WIDTH, + AlignFrame.NEW_WINDOW_HEIGHT); af.statusBar.setText("Successfully pasted alignment file"); } else @@ -332,9 +341,7 @@ this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this)); sp = new SliderPanel(ap, value, true, cs); conservationSlider = new JInternalFrame(); conservationSlider.setContentPane(sp); - addInternalFrame(conservationSlider, "Conservation Colour Increment ("+source+")", 420, 90); - conservationSlider.setResizable(false); - conservationSlider.setMaximizable(false); + addInternalFrame(conservationSlider, "Conservation Colour Increment ("+source+")", 420, 90, false); conservationSlider.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter() { public void internalFrameClosed(javax.swing.event.InternalFrameEvent e) @@ -342,6 +349,7 @@ this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this)); conservationSlider = null; } }); + conservationSlider.setLayer(JLayeredPane.PALETTE_LAYER); } else { @@ -386,9 +394,8 @@ this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this)); pid = new SliderPanel(ap, 50, false, cs); PIDSlider = new JInternalFrame(); PIDSlider.setContentPane(pid); - addInternalFrame(PIDSlider, "Percentage Identity Threshold ("+source+")", 420, 90); - PIDSlider.setResizable(false); - PIDSlider.setMaximizable(false); + addInternalFrame(PIDSlider, "Percentage Identity Threshold ("+source+")", 420, 90, false); + PIDSlider.setLayer(JLayeredPane.PALETTE_LAYER); } else { -- 1.7.10.2