dorkbox/SystemTray
2
1
Fork 1
Code Issues Pull Requests Releases 5 Wiki Activity

Can now select windows native implementation.

Browse Source
This commit is contained in:
nathan 2017-07-11 01:42:28 +02:00
parent 324acb4353
commit fac06e9176
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/dorkbox/systemTray/SystemTray.java
View File

@ -44,6 +44,7 @@ import dorkbox.systemTray.jna.linux.GtkEventDispatch;
import dorkbox.systemTray.nativeUI._AppIndicatorNativeTray; import dorkbox.systemTray.nativeUI._AppIndicatorNativeTray;
import dorkbox.systemTray.nativeUI._AwtTray; import dorkbox.systemTray.nativeUI._AwtTray;
import dorkbox.systemTray.nativeUI._GtkStatusIconNativeTray; import dorkbox.systemTray.nativeUI._GtkStatusIconNativeTray;
import dorkbox.systemTray.nativeUI._WindowsNativeTray;
import dorkbox.systemTray.swingUI.SwingUIFactory; import dorkbox.systemTray.swingUI.SwingUIFactory;
import dorkbox.systemTray.swingUI._SwingTray; import dorkbox.systemTray.swingUI._SwingTray;
import dorkbox.systemTray.util.ImageResizeUtil; import dorkbox.systemTray.util.ImageResizeUtil;
@ -83,6 +84,7 @@ class SystemTray {
AutoDetect, AutoDetect,
GtkStatusIcon, GtkStatusIcon,
AppIndicator, AppIndicator,
WindowsNotifyIcon,
Swing, Swing,
AWT AWT
} }
@ -173,6 +175,7 @@ class SystemTray {
switch (trayType) { switch (trayType) {
case GtkStatusIcon: return tray == _GtkStatusIconNativeTray.class; case GtkStatusIcon: return tray == _GtkStatusIconNativeTray.class;
case AppIndicator: return tray == _AppIndicatorNativeTray.class; case AppIndicator: return tray == _AppIndicatorNativeTray.class;
case WindowsNotifyIcon: return tray == _WindowsNativeTray.class;
case Swing: return tray == _SwingTray.class; case Swing: return tray == _SwingTray.class;
case AWT: return tray == _AwtTray.class; case AWT: return tray == _AwtTray.class;
} }
@ -188,6 +191,9 @@ class SystemTray {
else if (trayType == TrayType.AppIndicator) { else if (trayType == TrayType.AppIndicator) {
return _AppIndicatorNativeTray.class; return _AppIndicatorNativeTray.class;
} }
else if (trayType == TrayType.WindowsNotifyIcon) {
return _WindowsNativeTray.class;
}
else if (trayType == TrayType.Swing) { else if (trayType == TrayType.Swing) {
return _SwingTray.class; return _SwingTray.class;
} }
@ -216,7 +222,7 @@ class SystemTray {
Class<? extends Tray> getAutoDetectTrayType() { Class<? extends Tray> getAutoDetectTrayType() {
if (OS.isWindows()) { if (OS.isWindows()) {
try { try {
return selectType(TrayType.Swing); return selectType(TrayType.WindowsNotifyIcon);
} catch (Throwable e) { } catch (Throwable e) {
logger.error("You might need to grant the AWTPermission `accessSystemTray` to the SecurityManager.", e); logger.error("You might need to grant the AWTPermission `accessSystemTray` to the SecurityManager.", e);
} }
@ -426,7 +432,7 @@ class SystemTray {
// windows MUST use swing only! // windows MUST use swing only!
FORCE_TRAY_TYPE = TrayType.AutoDetect; FORCE_TRAY_TYPE = TrayType.AutoDetect;
logger.warn("Windows cannot use the '" + FORCE_TRAY_TYPE + "' SystemTray type, defaulting to Swing"); logger.warn("Windows cannot use the '" + FORCE_TRAY_TYPE + "' SystemTray type, defaulting to native implementation");
} }
} }
else if (OS.isMacOsX()) { else if (OS.isMacOsX()) {
@ -811,6 +817,12 @@ class SystemTray {
} }
} }
}); });
} else if (isTrayType(trayType, TrayType.WindowsNotifyIcon)) {
try {
reference.set((Tray) trayType.getConstructors()[0].newInstance(systemTray));
} catch (Exception e) {
logger.error("Unable to create tray type: '" + trayType.getSimpleName() + "'", e);
}
} else { } else {
logger.error("Unable to create tray type: '{}'. Aborting!", trayType.getSimpleName()); logger.error("Unable to create tray type: '{}'. Aborting!", trayType.getSimpleName());
} }