*/
package jalview.appletgui;
+import jalview.util.Platform;
+
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.FlowLayout;
* @author Jim Procter and Andrew Waterhouse
*
*/
+@SuppressWarnings("serial")
public class EmbmenuFrame extends Frame implements MouseListener
{
- protected static final Font FONT_ARIAL_PLAIN_11 = new Font(
- "Arial", Font.PLAIN, 11);
+ protected static final Font FONT_ARIAL_PLAIN_11 = new Font("Arial",
+ Font.PLAIN, 11);
public static final Font DEFAULT_MENU_FONT = FONT_ARIAL_PLAIN_11;
return false;
}
// DEBUG Hint: can test embedded menus by inserting true here.
- if (new jalview.util.Platform().isAMac())
+ if (Platform.isAMacAndNotJS())
{
// Build the embedded menu panel, allowing override with system font
embeddedMenu = makeEmbeddedPopupMenu(topMenuBar, true, false);
* @return the panel instance for convenience.
*/
protected Panel makeEmbeddedPopupMenu(MenuBar menuBar, Font font,
- boolean overrideFonts,
- Panel embeddedMenu,
+ boolean overrideFonts, Panel embeddedMenu,
MouseListener clickHandler)
{
if (overrideFonts)
if (popup != null)
{
embeddedMenu.add(popup);
- popup.show(embeddedMenu, source.getBounds().x, source.getBounds().y
- + source.getBounds().getSize().height);
+ popup.show(embeddedMenu, source.getBounds().x,
+ source.getBounds().y + source.getBounds().getSize().height);
}
}