Moved getting a buffered image from an icon

This commit is contained in:
nathan 2017-07-11 02:04:18 +02:00
parent b06184670e
commit c22082e26b
2 changed files with 2 additions and 11 deletions

View File

@ -107,16 +107,6 @@ public class WindowsBaseMenuItem {
}
}
static
BufferedImage createBitmap(Icon icon) {
BufferedImage bi = new BufferedImage(icon.getIconWidth(), icon.getIconHeight(), BufferedImage.TYPE_INT_ARGB);
Graphics2D g = bi.createGraphics();
g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER));
icon.paintIcon(null, g, 0, 0);
g.dispose();
return bi;
}
private static HBITMAPWrap convertMenuImage(Icon icon) {
// BufferedImage img = createBitmap(icon);

View File

@ -36,6 +36,7 @@ import javax.swing.ImageIcon;
import dorkbox.systemTray.MenuItem;
import dorkbox.systemTray.SystemTray;
import dorkbox.systemTray.Tray;
import dorkbox.util.ImageUtil;
import dorkbox.util.jna.windows.HBITMAPWrap;
import dorkbox.util.jna.windows.HICONWrap;
import dorkbox.util.jna.windows.Kernel32;
@ -263,7 +264,7 @@ class _WindowsNativeTray extends Tray implements NativeUI {
// fully loads the image and returns when it's done loading the image
imageIcon = new ImageIcon(imageIcon.getImage());
HBITMAPWrap hbitmapTrayIcon = new HBITMAPWrap(WindowsBaseMenuItem.createBitmap(imageIcon));
HBITMAPWrap hbitmapTrayIcon = new HBITMAPWrap(ImageUtil.getBufferedImage(imageIcon));
return new HICONWrap(hbitmapTrayIcon);
}