X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJalviewDialog.java;h=1d7bf3d0504b1fec032a61e6827fc560e2f24c42;hb=299d07a9554a3661d44395aa2c6bad9cecd10bf0;hp=87422535ae2101ed1801635c43d49c67796e2b5c;hpb=046c86c533264ad09a43f801bb6bf47d669cec5f;p=jalview.git diff --git a/src/jalview/gui/JalviewDialog.java b/src/jalview/gui/JalviewDialog.java index 8742253..1d7bf3d 100644 --- a/src/jalview/gui/JalviewDialog.java +++ b/src/jalview/gui/JalviewDialog.java @@ -23,11 +23,12 @@ package jalview.gui; import jalview.util.MessageManager; import java.awt.Container; +import java.awt.Dimension; import java.awt.Rectangle; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.awt.event.WindowListener; import javax.swing.JButton; import javax.swing.JDialog; @@ -89,6 +90,9 @@ public abstract class JalviewDialog extends JPanel { frame.setSize(width, height); } + int minWidth = width - 100; + int minHeight = height - 100; + frame.setMinimumSize(new Dimension(minWidth, minHeight)); frame.setContentPane(content); this.block = block; @@ -114,55 +118,14 @@ public abstract class JalviewDialog extends JPanel closeDialog(); } }); - frame.addWindowListener(new WindowListener() + frame.addWindowListener(new WindowAdapter() { - - @Override - public void windowOpened(WindowEvent e) - { - // TODO Auto-generated method stub - - } - - @Override - public void windowIconified(WindowEvent e) - { - // TODO Auto-generated method stub - - } - - @Override - public void windowDeiconified(WindowEvent e) - { - // TODO Auto-generated method stub - - } - - @Override - public void windowDeactivated(WindowEvent e) - { - // TODO Auto-generated method stub - - } - @Override public void windowClosing(WindowEvent e) { // user has cancelled the dialog closeDialog(); } - - @Override - public void windowClosed(WindowEvent e) - { - } - - @Override - public void windowActivated(WindowEvent e) - { - // TODO Auto-generated method stub - - } }); } @@ -173,8 +136,8 @@ public abstract class JalviewDialog extends JPanel { try { - frame.dispose(); raiseClosed(); + frame.dispose(); } catch (Exception ex) { }