src/java.desktop/unix/classes/sun/awt/X11/XComponentPeer.java

*** 156,166 ****
  
      public void reparent(ContainerPeer newNativeParent) {
          XComponentPeer newPeer = (XComponentPeer)newNativeParent;
          XToolkit.awtLock();
          try {
!             XlibWrapper.XReparentWindow(XToolkit.getDisplay(), getWindow(), newPeer.getContentWindow(), x, y);
              parentWindow = newPeer;
          } finally {
              XToolkit.awtUnlock();
          }
      }
--- 156,168 ----
  
      public void reparent(ContainerPeer newNativeParent) {
          XComponentPeer newPeer = (XComponentPeer)newNativeParent;
          XToolkit.awtLock();
          try {
!             XlibWrapper.XReparentWindow(XToolkit.getDisplay(),
!                                         getWindow(), newPeer.getContentWindow(),
!                                         scaleUp(x), scaleUp(y));
              parentWindow = newPeer;
          } finally {
              XToolkit.awtUnlock();
          }
      }
*** 1392,1401 ****
--- 1394,1409 ----
                          + "; SHAPE: " + shape);
              }
              XToolkit.awtLock();
              try {
                  if (shape != null) {
+ 
+                     int scale = getScale();
+                     if (scale != 1) {
+                         shape = shape.getScaledRegion(scale, scale);
+                     }
+ 
                      XlibWrapper.SetRectangularShape(
                              XToolkit.getDisplay(),
                              getWindow(),
                              shape.getLoX(), shape.getLoY(),
                              shape.getHiX(), shape.getHiY(),