-
- fileMenu.remove(closeMenuItem);
- fileMenu.remove(3); // Seperator
-
- viewport.applet.setLayout(new BorderLayout());
- viewport.applet.add(embeddedMenu, BorderLayout.NORTH);
- viewport.applet.add(statusBar, BorderLayout.SOUTH);
-
- alignPanel.setSize(viewport.applet.getSize().width,
- viewport.applet.getSize().height
- - embeddedMenu.HEIGHT - statusBar.HEIGHT);
-
- viewport.applet.add(alignPanel, BorderLayout.CENTER);
- viewport.applet.validate();
-
+ if (reallyEmbedded)
+ {
+ // view cannot be closed if its actually on the page
+ fileMenu.remove(closeMenuItem);
+ fileMenu.remove(3); // Remove Seperator
+ // and actually add the components to the applet area
+ viewport.applet.setLayout(new BorderLayout());
+ viewport.applet.add(embeddedMenu, BorderLayout.NORTH);
+ viewport.applet.add(statusBar, BorderLayout.SOUTH);
+ alignPanel.setSize(viewport.applet.getSize().width,
+ viewport.applet.getSize().height
+ - embeddedMenu.HEIGHT - statusBar.HEIGHT);
+ viewport.applet.add(alignPanel, BorderLayout.CENTER);
+ viewport.applet.validate();
+ } else {
+ if (new jalview.util.Platform().isAMac())
+ {
+ // TODO: try to modify the embeddedMenu display so it looks like a real toolbar menu
+ // TODO: modify click/mouse handler for embeddedMenu so it behaves more like a real pulldown menu toolbar
+ setMenuBar(null);// alignFramMenuBar);
+ // add the components to the AlignFrame area.
+ add(embeddedMenu, BorderLayout.NORTH);
+ alignPanel.setSize(getSize().width,
+ getSize().height
+ - embeddedMenu.HEIGHT - statusBar.HEIGHT);
+
+ }
+ add(statusBar, BorderLayout.SOUTH);
+ add(alignPanel, BorderLayout.CENTER);
+ // and register with the applet so it can pass external API calls to us
+ jalview.bin.JalviewLite.addFrame(this, title, DEFAULT_WIDTH,
+ DEFAULT_HEIGHT);
+ }