(revert) UI components are now cached

This commit is contained in:
nathan 2017-07-16 12:32:19 +02:00
parent e1a191e155
commit a034321080

View File

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