elzoughby/SystemTray
1
0
Fork 0
forked from dorkbox/SystemTray
Code Issues Pull Requests Releases Wiki Activity

Organized swing menu logic

Browse Source
This commit is contained in:
nathan 2016-10-09 15:56:58 +02:00
parent b976338b46
commit 0e56ca199a
2 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/dorkbox/systemTray/swing/SwingMenu.java
View File

@ -37,6 +37,8 @@ import dorkbox.util.SwingUtil;
// this is a weird composite class, because it must be a Menu, but ALSO a MenuEntry -- so it has both
class SwingMenu extends Menu {
// sub-menu = AdjustedJMenu
// systemtray = SwingSystemTrayMenuPopup
volatile JComponent _native;
// this have to be volatile, because they can be changed from any thread
@ -44,32 +46,16 @@ class SwingMenu extends Menu {
private volatile boolean hasLegitIcon = false;
/**
* Called in the EDT
*
* @param systemTray
* the system tray (which is the object that sits in the system tray)
* @param parent
* the parent of this menu, null if the parent is the system tray
*/
SwingMenu(final SystemTray systemTray, final Menu parent) {
SwingMenu(final SystemTray systemTray, final Menu parent, final JComponent _native) {
super(systemTray, parent);
try {
SwingUtil.invokeAndWait(new Runnable() {
@Override
public
void run() {
if (parent != null) {
// when we are a sub-menu
_native = new AdjustedJMenu();
((SwingMenu) parent)._native.add(_native);
} else {
// when we are the system tray
_native = new SwingSystemTrayMenuPopup();
}
}
});
} catch (Exception e) {
SystemTray.logger.error("Error processing event on the dispatch thread.", e);
}
this._native = _native;
}
protected
@ -173,7 +159,9 @@ class SwingMenu extends Menu {
if (menuEntry == null) {
// must always be called on the EDT
menuEntry = new SwingMenu(getSystemTray(), SwingMenu.this);
menuEntry = new SwingMenu(getSystemTray(), SwingMenu.this, new AdjustedJMenu());
_native.add(((SwingMenu) menuEntry)._native);
menuEntry.setText(menuText);
menuEntry.setImage(imagePath);
value.set((Menu)menuEntry);

10
src/dorkbox/systemTray/swing/SwingSystemTray.java
View File

@ -48,22 +48,16 @@ class SwingSystemTray extends SwingMenu {
volatile TrayIcon trayIcon;
/**
* Creates a new system tray handler class.
* Creates a new system tray handler class. Called in the EDT
*/
public
SwingSystemTray(final dorkbox.systemTray.SystemTray systemTray) {
super(systemTray, null);
super(systemTray, null, new SwingSystemTrayMenuPopup());
ImageUtils.determineIconSize();
dispatchAndWait(new Runnable() {
@Override
public
void run() {
SwingSystemTray.this.tray = SystemTray.getSystemTray();
}
});
}
public
void shutdown() {