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

Fixed erroneous warning messages for windows/mac.

Browse Source
This commit is contained in:
nathan 2017-02-22 14:32:30 +01:00
parent aeae1494fd
commit fe6b09e8dd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -287,14 +287,14 @@ class SystemTray {
// OSx can use Swing (non-native) or AWT (native) . // OSx can use Swing (non-native) or AWT (native) .
// Linux can use Swing (non-native) menus + (native Icon via GTK or AppIndicator), GtkStatusIcon (native), or AppIndicator (native) // Linux can use Swing (non-native) menus + (native Icon via GTK or AppIndicator), GtkStatusIcon (native), or AppIndicator (native)
if (OS.isWindows()) { if (OS.isWindows()) {
if (FORCE_TRAY_TYPE != TrayType.Swing) { if (FORCE_TRAY_TYPE != TrayType.AutoDetect && FORCE_TRAY_TYPE != TrayType.Swing) {
// 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 Swing");
} }
} }
else if (OS.isMacOsX()) { else if (OS.isMacOsX()) {
if (FORCE_TRAY_TYPE != TrayType.Swing ) { if (FORCE_TRAY_TYPE != TrayType.AutoDetect && FORCE_TRAY_TYPE != TrayType.Swing && FORCE_TRAY_TYPE != TrayType.AWT) {
// MacOsX MUST use swing (and AWT) only! // MacOsX MUST use swing (and AWT) only!
FORCE_TRAY_TYPE = TrayType.AutoDetect; FORCE_TRAY_TYPE = TrayType.AutoDetect;
logger.warn("MacOS cannot use the '" + FORCE_TRAY_TYPE + "' SystemTray type, defaulting to Awt"); logger.warn("MacOS cannot use the '" + FORCE_TRAY_TYPE + "' SystemTray type, defaulting to Awt");