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

Code polish

Browse Source
This commit is contained in:
nathan 2017-05-10 15:24:30 +02:00
parent ca56dc9215
commit eb702327d5
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dorkbox/systemTray/swingUI/SwingMenuItem.java
View File

@ -21,12 +21,13 @@ import java.io.File;
import javax.swing.ImageIcon;
import javax.swing.JMenuItem;
import javax.swing.SwingConstants;
import dorkbox.systemTray.Entry;
import dorkbox.systemTray.MenuItem;
import dorkbox.systemTray.SystemTray;
import dorkbox.systemTray.peer.MenuItemPeer;
import dorkbox.systemTray.util.ImageUtils;
import dorkbox.systemTray.util.ImageResizeUtil;
import dorkbox.util.SwingUtil;
class SwingMenuItem implements MenuItemPeer {
@ -48,10 +49,11 @@ class SwingMenuItem implements MenuItemPeer {
_native.setUI(SystemTray.SWING_UI.getItemUI(_native, entry));
}
_native.setHorizontalAlignment(SwingConstants.LEFT);
parent._native.add(_native);
if (transparentIcon == null) {
File uncheckedFile = ImageUtils.getTransparentImage(ImageUtils.ENTRY_SIZE);
File uncheckedFile = ImageResizeUtil.getTransparentImage();
transparentIcon = new ImageIcon(uncheckedFile.getAbsolutePath());
}

2
src/dorkbox/systemTray/swingUI/SwingMenuItemStatus.java
View File

@ -18,6 +18,7 @@ package dorkbox.systemTray.swingUI;
import java.awt.Font;
import javax.swing.JMenuItem;
import javax.swing.SwingConstants;
import dorkbox.systemTray.Entry;
import dorkbox.systemTray.Status;
@ -38,6 +39,7 @@ class SwingMenuItemStatus implements StatusPeer {
_native.setUI(SystemTray.SWING_UI.getItemUI(_native, entry));
}
_native.setHorizontalAlignment(SwingConstants.LEFT);
// status is ALWAYS at 0 index...
parent._native.add(_native, 0);

14
src/dorkbox/systemTray/swingUI/_SwingTray.java
View File

@ -59,8 +59,6 @@ class _SwingTray extends Tray implements SwingUI {
"type and configuration");
}
_SwingTray.this.tray = SystemTray.getSystemTray();
// we override various methods, because each tray implementation is SLIGHTLY different. This allows us customization.
final SwingMenu swingMenu = new SwingMenu(null, null) {
@Override
@ -70,6 +68,10 @@ class _SwingTray extends Tray implements SwingUI {
@Override
public
void run() {
if (tray == null) {
tray = SystemTray.getSystemTray();
}
boolean enabled = menuItem.getEnabled();
if (visible && !enabled) {
@ -104,6 +106,10 @@ class _SwingTray extends Tray implements SwingUI {
@Override
public
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
final Image trayImage = new ImageIcon(imageFile.getAbsolutePath()).getImage();
trayImage.flush();
@ -167,7 +173,9 @@ class _SwingTray extends Tray implements SwingUI {
public
void run() {
if (trayIcon != null) {
tray.remove(trayIcon);
if (tray != null) {
tray.remove(trayIcon);
}
trayIcon = null;
}