Change peer/native class name to make more sense when it's swing
This commit is contained in:
parent
03e56adc02
commit
bc5871d920
|
@ -47,8 +47,8 @@ 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.swingUI.SwingUI;
|
import dorkbox.systemTray.swingUI.SwingUI;
|
||||||
import dorkbox.systemTray.swingUI._AppIndicatorTray;
|
import dorkbox.systemTray.swingUI._AppIndicatorSwingTray;
|
||||||
import dorkbox.systemTray.swingUI._GtkStatusIconTray;
|
import dorkbox.systemTray.swingUI._GtkStatusIconSwingTray;
|
||||||
import dorkbox.systemTray.swingUI._SwingTray;
|
import dorkbox.systemTray.swingUI._SwingTray;
|
||||||
import dorkbox.systemTray.util.ImageUtils;
|
import dorkbox.systemTray.util.ImageUtils;
|
||||||
import dorkbox.systemTray.util.JavaFX;
|
import dorkbox.systemTray.util.JavaFX;
|
||||||
|
@ -195,8 +195,8 @@ class SystemTray {
|
||||||
private static
|
private static
|
||||||
boolean isTrayType(final Class<? extends Tray> tray, final TrayType trayType) {
|
boolean isTrayType(final Class<? extends Tray> tray, final TrayType trayType) {
|
||||||
switch (trayType) {
|
switch (trayType) {
|
||||||
case GtkStatusIcon: return (tray == _GtkStatusIconTray.class || tray == _GtkStatusIconNativeTray.class);
|
case GtkStatusIcon: return (tray == _GtkStatusIconSwingTray.class || tray == _GtkStatusIconNativeTray.class);
|
||||||
case AppIndicator: return (tray == _AppIndicatorTray.class || tray == _AppIndicatorNativeTray.class);
|
case AppIndicator: return (tray == _AppIndicatorSwingTray.class || tray == _AppIndicatorNativeTray.class);
|
||||||
case Swing: return (tray == _SwingTray.class || tray == _AwtTray.class);
|
case Swing: return (tray == _SwingTray.class || tray == _AwtTray.class);
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
@ -208,14 +208,14 @@ class SystemTray {
|
||||||
if (useNativeMenus) {
|
if (useNativeMenus) {
|
||||||
return _GtkStatusIconNativeTray.class;
|
return _GtkStatusIconNativeTray.class;
|
||||||
} else {
|
} else {
|
||||||
return _GtkStatusIconTray.class;
|
return _GtkStatusIconSwingTray.class;
|
||||||
}
|
}
|
||||||
} else if (trayType == TrayType.AppIndicator) {
|
} else if (trayType == TrayType.AppIndicator) {
|
||||||
if (useNativeMenus) {
|
if (useNativeMenus) {
|
||||||
return _AppIndicatorNativeTray.class;
|
return _AppIndicatorNativeTray.class;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
return _AppIndicatorTray.class;
|
return _AppIndicatorSwingTray.class;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (trayType == TrayType.Swing) {
|
else if (trayType == TrayType.Swing) {
|
||||||
|
|
|
@ -82,7 +82,7 @@ import dorkbox.util.SwingUtil;
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("Duplicates")
|
@SuppressWarnings("Duplicates")
|
||||||
public
|
public
|
||||||
class _AppIndicatorTray extends Tray implements SwingUI {
|
class _AppIndicatorSwingTray extends Tray implements SwingUI {
|
||||||
private volatile AppIndicatorInstanceStruct appIndicator;
|
private volatile AppIndicatorInstanceStruct appIndicator;
|
||||||
private boolean isActive = false;
|
private boolean isActive = false;
|
||||||
private volatile Runnable popupRunnable;
|
private volatile Runnable popupRunnable;
|
||||||
|
@ -110,7 +110,7 @@ class _AppIndicatorTray extends Tray implements SwingUI {
|
||||||
// trayIcon.setToolTip("app name");
|
// trayIcon.setToolTip("app name");
|
||||||
|
|
||||||
public
|
public
|
||||||
_AppIndicatorTray(final SystemTray systemTray) {
|
_AppIndicatorSwingTray(final SystemTray systemTray) {
|
||||||
super();
|
super();
|
||||||
|
|
||||||
Gtk.startGui();
|
Gtk.startGui();
|
|
@ -44,7 +44,7 @@ import dorkbox.util.SwingUtil;
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("Duplicates")
|
@SuppressWarnings("Duplicates")
|
||||||
public
|
public
|
||||||
class _GtkStatusIconTray extends Tray implements SwingUI {
|
class _GtkStatusIconSwingTray extends Tray implements SwingUI {
|
||||||
private volatile Pointer trayIcon;
|
private volatile Pointer trayIcon;
|
||||||
|
|
||||||
// have to save these in a field to prevent GC on the objects (since they go out-of-scope from java)
|
// have to save these in a field to prevent GC on the objects (since they go out-of-scope from java)
|
||||||
|
@ -62,7 +62,7 @@ class _GtkStatusIconTray extends Tray implements SwingUI {
|
||||||
|
|
||||||
// called on the EDT
|
// called on the EDT
|
||||||
public
|
public
|
||||||
_GtkStatusIconTray(final SystemTray systemTray) {
|
_GtkStatusIconSwingTray(final SystemTray systemTray) {
|
||||||
super();
|
super();
|
||||||
|
|
||||||
Gtk.startGui();
|
Gtk.startGui();
|
Loading…
Reference in New Issue
Block a user