Code polish
This commit is contained in:
parent
ca56dc9215
commit
eb702327d5
|
@ -21,12 +21,13 @@ import java.io.File;
|
||||||
|
|
||||||
import javax.swing.ImageIcon;
|
import javax.swing.ImageIcon;
|
||||||
import javax.swing.JMenuItem;
|
import javax.swing.JMenuItem;
|
||||||
|
import javax.swing.SwingConstants;
|
||||||
|
|
||||||
import dorkbox.systemTray.Entry;
|
import dorkbox.systemTray.Entry;
|
||||||
import dorkbox.systemTray.MenuItem;
|
import dorkbox.systemTray.MenuItem;
|
||||||
import dorkbox.systemTray.SystemTray;
|
import dorkbox.systemTray.SystemTray;
|
||||||
import dorkbox.systemTray.peer.MenuItemPeer;
|
import dorkbox.systemTray.peer.MenuItemPeer;
|
||||||
import dorkbox.systemTray.util.ImageUtils;
|
import dorkbox.systemTray.util.ImageResizeUtil;
|
||||||
import dorkbox.util.SwingUtil;
|
import dorkbox.util.SwingUtil;
|
||||||
|
|
||||||
class SwingMenuItem implements MenuItemPeer {
|
class SwingMenuItem implements MenuItemPeer {
|
||||||
|
@ -48,10 +49,11 @@ class SwingMenuItem implements MenuItemPeer {
|
||||||
_native.setUI(SystemTray.SWING_UI.getItemUI(_native, entry));
|
_native.setUI(SystemTray.SWING_UI.getItemUI(_native, entry));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_native.setHorizontalAlignment(SwingConstants.LEFT);
|
||||||
parent._native.add(_native);
|
parent._native.add(_native);
|
||||||
|
|
||||||
if (transparentIcon == null) {
|
if (transparentIcon == null) {
|
||||||
File uncheckedFile = ImageUtils.getTransparentImage(ImageUtils.ENTRY_SIZE);
|
File uncheckedFile = ImageResizeUtil.getTransparentImage();
|
||||||
transparentIcon = new ImageIcon(uncheckedFile.getAbsolutePath());
|
transparentIcon = new ImageIcon(uncheckedFile.getAbsolutePath());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -18,6 +18,7 @@ package dorkbox.systemTray.swingUI;
|
||||||
import java.awt.Font;
|
import java.awt.Font;
|
||||||
|
|
||||||
import javax.swing.JMenuItem;
|
import javax.swing.JMenuItem;
|
||||||
|
import javax.swing.SwingConstants;
|
||||||
|
|
||||||
import dorkbox.systemTray.Entry;
|
import dorkbox.systemTray.Entry;
|
||||||
import dorkbox.systemTray.Status;
|
import dorkbox.systemTray.Status;
|
||||||
|
@ -38,6 +39,7 @@ class SwingMenuItemStatus implements StatusPeer {
|
||||||
_native.setUI(SystemTray.SWING_UI.getItemUI(_native, entry));
|
_native.setUI(SystemTray.SWING_UI.getItemUI(_native, entry));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_native.setHorizontalAlignment(SwingConstants.LEFT);
|
||||||
// status is ALWAYS at 0 index...
|
// status is ALWAYS at 0 index...
|
||||||
parent._native.add(_native, 0);
|
parent._native.add(_native, 0);
|
||||||
|
|
||||||
|
|
|
@ -59,8 +59,6 @@ class _SwingTray extends Tray implements SwingUI {
|
||||||
"type and configuration");
|
"type and configuration");
|
||||||
}
|
}
|
||||||
|
|
||||||
_SwingTray.this.tray = SystemTray.getSystemTray();
|
|
||||||
|
|
||||||
// we override various methods, because each tray implementation is SLIGHTLY different. This allows us customization.
|
// we override various methods, because each tray implementation is SLIGHTLY different. This allows us customization.
|
||||||
final SwingMenu swingMenu = new SwingMenu(null, null) {
|
final SwingMenu swingMenu = new SwingMenu(null, null) {
|
||||||
@Override
|
@Override
|
||||||
|
@ -70,6 +68,10 @@ class _SwingTray extends Tray implements SwingUI {
|
||||||
@Override
|
@Override
|
||||||
public
|
public
|
||||||
void run() {
|
void run() {
|
||||||
|
if (tray == null) {
|
||||||
|
tray = SystemTray.getSystemTray();
|
||||||
|
}
|
||||||
|
|
||||||
boolean enabled = menuItem.getEnabled();
|
boolean enabled = menuItem.getEnabled();
|
||||||
|
|
||||||
if (visible && !enabled) {
|
if (visible && !enabled) {
|
||||||
|
@ -104,6 +106,10 @@ class _SwingTray extends Tray implements SwingUI {
|
||||||
@Override
|
@Override
|
||||||
public
|
public
|
||||||
void run() {
|
void run() {
|
||||||
|
if (tray == null) {
|
||||||
|
tray = SystemTray.getSystemTray();
|
||||||
|
}
|
||||||
|
|
||||||
// stupid java won't scale it right away, so we have to do this twice to get the correct size
|
// stupid java won't scale it right away, so we have to do this twice to get the correct size
|
||||||
final Image trayImage = new ImageIcon(imageFile.getAbsolutePath()).getImage();
|
final Image trayImage = new ImageIcon(imageFile.getAbsolutePath()).getImage();
|
||||||
trayImage.flush();
|
trayImage.flush();
|
||||||
|
@ -167,7 +173,9 @@ class _SwingTray extends Tray implements SwingUI {
|
||||||
public
|
public
|
||||||
void run() {
|
void run() {
|
||||||
if (trayIcon != null) {
|
if (trayIcon != null) {
|
||||||
tray.remove(trayIcon);
|
if (tray != null) {
|
||||||
|
tray.remove(trayIcon);
|
||||||
|
}
|
||||||
trayIcon = null;
|
trayIcon = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user