X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMain.java;fp=src%2Fedu%2Fberkeley%2Fqfat%2FMain.java;h=3d0b0e4ae3d8d82385ce19c6083c935709d91edd;hp=4ae3a8e519f57df01a7d131f7554ef8e6de9ad0e;hb=a4dade9d9503188c6e5638524213858b3d16304d;hpb=e4d317da98c8126fa7cfb4d0097419d8f0d383a5 diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java index 4ae3a8e..3d0b0e4 100644 --- a/src/edu/berkeley/qfat/Main.java +++ b/src/edu/berkeley/qfat/Main.java @@ -921,8 +921,8 @@ public class Main extends InteractiveMeshViewer { // Finally, add all the menus to the menu bar. add(tileMenu); - add(goalMenu); - add(hideMenu); + //add(goalMenu); + //add(hideMenu); } } @@ -1085,11 +1085,27 @@ public class Main extends InteractiveMeshViewer { f.setLayout(new BorderLayout()); Main main = new Main(f); f.add(main, BorderLayout.CENTER); - f.setJMenuBar(main.new MyMenuBar()); + + f.addWindowListener(new WindowListener() { + public void windowActivated(WindowEvent e) { } + public void windowClosed(WindowEvent e) { System.exit(0); } + public void windowClosing(WindowEvent e) { System.exit(0); } + public void windowDeactivated(WindowEvent e) { } + public void windowDeiconified(WindowEvent e) { } + public void windowIconified(WindowEvent e) { } + public void windowOpened(WindowEvent e) { } + }); + f.pack(); f.show(); f.setSize(900, 900); f.doLayout(); + + JFrame f2 = new JFrame(); + f2.setJMenuBar(main.new MyMenuBar()); + f2.setSize(100,100); + f2.show(); + main.anneal(); }