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

Fixed issues with EDT & mac with image utils

Browse Source
This commit is contained in:
nathan 2016-12-10 00:56:53 +01:00
parent 28ce208594
commit 06b3da9831
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/dorkbox/systemTray/util/ImageUtils.java
View File

@ -33,11 +33,13 @@ import java.io.InputStream;
import java.io.PrintStream; import java.io.PrintStream;
import java.net.URL; import java.net.URL;
import java.util.Iterator; import java.util.Iterator;
import java.util.concurrent.atomic.AtomicInteger;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.imageio.ImageReader; import javax.imageio.ImageReader;
import javax.imageio.stream.ImageInputStream; import javax.imageio.stream.ImageInputStream;
import javax.swing.ImageIcon; import javax.swing.ImageIcon;
import javax.swing.SwingUtilities;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
@ -48,6 +50,7 @@ import dorkbox.util.FileUtil;
import dorkbox.util.IO; import dorkbox.util.IO;
import dorkbox.util.LocationResolver; import dorkbox.util.LocationResolver;
import dorkbox.util.OS; import dorkbox.util.OS;
import dorkbox.util.SwingUtil;
import dorkbox.util.process.ShellProcessBuilder; import dorkbox.util.process.ShellProcessBuilder;
public public
@ -274,9 +277,26 @@ class ImageUtils {
} }
} else if (OS.isMacOsX()) { } else if (OS.isMacOsX()) {
// let's hope this wasn't just hardcoded like windows... // let's hope this wasn't just hardcoded like windows...
int height = (int) java.awt.SystemTray.getSystemTray() int height;
.getTrayIconSize()
.getHeight(); if (!SwingUtilities.isEventDispatchThread()) {
// MacOS must execute this on the EDT... It is very strict compared to win/linux
final AtomicInteger h = new AtomicInteger(0);
SwingUtil.invokeAndWaitQuietly(new Runnable() {
@Override
public
void run() {
h.set((int) java.awt.SystemTray.getSystemTray()
.getTrayIconSize()
.getHeight());
}
});
height = h.get();
} else {
height = (int) java.awt.SystemTray.getSystemTray()
.getTrayIconSize()
.getHeight();
}
if (height < 32) { if (height < 32) {
// lock in at 32 // lock in at 32