From c22082e26b1589724b1a001ad8e307e107a605bc Mon Sep 17 00:00:00 2001
From: nathan <nathan@dorkbox.com>
Date: Tue, 11 Jul 2017 02:04:18 +0200
Subject: [PATCH] Moved getting a buffered image from an icon

---
 .../systemTray/nativeUI/WindowsBaseMenuItem.java       | 10 ----------
 .../systemTray/nativeUI/_WindowsNativeTray.java        |  3 ++-
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/dorkbox/systemTray/nativeUI/WindowsBaseMenuItem.java b/src/dorkbox/systemTray/nativeUI/WindowsBaseMenuItem.java
index a8e5819..416f5ea 100644
--- a/src/dorkbox/systemTray/nativeUI/WindowsBaseMenuItem.java
+++ b/src/dorkbox/systemTray/nativeUI/WindowsBaseMenuItem.java
@@ -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);
 
diff --git a/src/dorkbox/systemTray/nativeUI/_WindowsNativeTray.java b/src/dorkbox/systemTray/nativeUI/_WindowsNativeTray.java
index 4c52de5..da5da0b 100644
--- a/src/dorkbox/systemTray/nativeUI/_WindowsNativeTray.java
+++ b/src/dorkbox/systemTray/nativeUI/_WindowsNativeTray.java
@@ -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);
         }