src/java.desktop/windows/classes/sun/awt/windows/WTrayIconPeer.java

*** 26,39 ****
--- 26,45 ----
  package sun.awt.windows;
  
  import java.awt.Graphics2D;
  import java.awt.AWTEvent;
  import java.awt.Frame;
+ import java.awt.GraphicsConfiguration;
+ import java.awt.GraphicsDevice;
+ import java.awt.GraphicsEnvironment;
  import java.awt.PopupMenu;
  import java.awt.Point;
  import java.awt.TrayIcon;
  import java.awt.Image;
+ import java.awt.Insets;
+ import java.awt.Toolkit;
+ import java.awt.geom.AffineTransform;
  import java.awt.peer.TrayIconPeer;
  import java.awt.image.*;
  
  import sun.awt.AWTAccessor;
  import sun.awt.SunToolkit;
*** 128,138 ****
                                                     BufferedImage.TYPE_INT_ARGB);
          Graphics2D gr = bufImage.createGraphics();
          if (gr != null) {
              try {
                  gr.setPaintMode();
! 
                  gr.drawImage(image, 0, 0, (autosize ? TRAY_ICON_WIDTH : image.getWidth(observer)),
                               (autosize ? TRAY_ICON_HEIGHT : image.getHeight(observer)), observer);
  
                  createNativeImage(bufImage);
  
--- 134,163 ----
                                                     BufferedImage.TYPE_INT_ARGB);
          Graphics2D gr = bufImage.createGraphics();
          if (gr != null) {
              try {
                  gr.setPaintMode();
!                 GraphicsEnvironment ge = GraphicsEnvironment.
!                         getLocalGraphicsEnvironment();
!                 Toolkit toolkit = Toolkit.getDefaultToolkit();
!                 GraphicsDevice[] gds = ge.getScreenDevices();
!                 GraphicsDevice device = ge.getDefaultScreenDevice();
!                 Insets in = new Insets(0, 0, 0, 0);
!                 for (GraphicsDevice gd : gds) {
!                     GraphicsConfiguration gc = gd.getDefaultConfiguration();
!                     Insets insets = toolkit.getScreenInsets(gc);
!                     if (insets.bottom > in.bottom
!                             || insets.top > in.top
!                             || insets.left > in.left
!                             || insets.right > in.right) {
!                         in = insets;
!                         device = gd;
!                     }
!                 }
!                 AffineTransform tx = device.getDefaultConfiguration().
!                         getDefaultTransform();
!                 gr.setTransform(tx);
                  gr.drawImage(image, 0, 0, (autosize ? TRAY_ICON_WIDTH : image.getWidth(observer)),
                               (autosize ? TRAY_ICON_HEIGHT : image.getHeight(observer)), observer);
  
                  createNativeImage(bufImage);