diff --git a/src/dorkbox/systemTray/util/LinuxSwingUI.java b/src/dorkbox/systemTray/util/LinuxSwingUI.java index 88a15f3..6e10387 100644 --- a/src/dorkbox/systemTray/util/LinuxSwingUI.java +++ b/src/dorkbox/systemTray/util/LinuxSwingUI.java @@ -83,23 +83,19 @@ class LinuxSwingUI implements SwingUIFactory { @Override public PopupMenuUI getMenuUI(final JPopupMenu jPopupMenu, final Menu entry) { - if (popupMenuUI == null) { - popupMenuUI = new DefaultPopupMenuUI(jPopupMenu) { - @Override - public - void installUI(final JComponent c) { - super.installUI(c); + return new DefaultPopupMenuUI(jPopupMenu) { + @Override + public + void installUI(final JComponent c) { + super.installUI(c); - JPopupMenu popupMenu = (JPopupMenu) c; + JPopupMenu popupMenu = (JPopupMenu) c; - // borderUI resource border type will get changed internally! - // setBorder(new BorderUIResource.EmptyBorderUIResource(0, 0, 0, 0)); - popupMenu.setBorder(new EmptyBorder(1, 1, 1, 1)); - } - }; - } - - return popupMenuUI; + // borderUI resource border type will get changed internally! + // setBorder(new BorderUIResource.EmptyBorderUIResource(0, 0, 0, 0)); + popupMenu.setBorder(new EmptyBorder(1, 1, 1, 1)); + } + }; } /** @@ -113,23 +109,19 @@ class LinuxSwingUI implements SwingUIFactory { @Override public MenuItemUI getItemUI(final JMenuItem jMenuItem, final Entry entry) { - if (menuItemUI == null) { - menuItemUI = new DefaultMenuItemUI(jMenuItem) { - @Override - public - void installUI(final JComponent c) { - super.installUI(c); + return new DefaultMenuItemUI(jMenuItem) { + @Override + public + void installUI(final JComponent c) { + super.installUI(c); - JMenuItem menuItem = (JMenuItem) c; - menuItem.setIconTextGap(8); - // the original is hardcoded to always be 2 (top/bottom). We want this to be larger, so the vertical spacing looks like - // other menus - c.setBorder(new Metal_MenuItemBorder(4)); - } - }; - } - - return menuItemUI; + JMenuItem menuItem = (JMenuItem) c; + menuItem.setIconTextGap(8); + // the original is hardcoded to always be 2 (top/bottom). We want this to be larger, so the vertical spacing looks like + // other menus + c.setBorder(new Metal_MenuItemBorder(4)); + } + }; } /** @@ -142,11 +134,7 @@ class LinuxSwingUI implements SwingUIFactory { @Override public SeparatorUI getSeparatorUI(final JSeparator jSeparator) { - if (separatorUI == null) { - separatorUI = new DefaultSeparatorUI(jSeparator); - } - - return separatorUI; + return new DefaultSeparatorUI(jSeparator); } /**