src/java.desktop/windows/native/libawt/windows/awt_Component.cpp

*** 956,980 ****
      }
      ::SetWindowPlacement(wnd, &wp);
      return 1;
  }
  
  
! void AwtComponent::Reshape(int x, int y, int w, int h)
  {
  #if defined(DEBUG)
      RECT        rc;
      ::GetWindowRect(GetHWnd(), &rc);
      ::MapWindowPoints(HWND_DESKTOP, ::GetParent(GetHWnd()), (LPPOINT)&rc, 2);
      DTRACE_PRINTLN4("AwtComponent::Reshape from %d, %d, %d, %d", rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top);
  #endif
  
-     x = ScaleUpX(x);
-     y = ScaleUpY(y);
-     w = ScaleUpX(w);
-     h = ScaleUpY(h);
- 
      AwtWindow* container = GetContainer();
      AwtComponent* parent = GetParent();
      if (container != NULL && container == parent) {
          container->SubtractInsetPoint(x, y);
      }
--- 956,978 ----
      }
      ::SetWindowPlacement(wnd, &wp);
      return 1;
  }
  
+ void AwtComponent::Reshape(int x, int y, int w, int h) {
+     ReshapeNoScale(ScaleUpX(x), ScaleUpY(y), ScaleUpX(w), ScaleUpY(h));
+ }
  
! void AwtComponent::ReshapeNoScale(int x, int y, int w, int h)
  {
  #if defined(DEBUG)
      RECT        rc;
      ::GetWindowRect(GetHWnd(), &rc);
      ::MapWindowPoints(HWND_DESKTOP, ::GetParent(GetHWnd()), (LPPOINT)&rc, 2);
      DTRACE_PRINTLN4("AwtComponent::Reshape from %d, %d, %d, %d", rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top);
  #endif
  
      AwtWindow* container = GetContainer();
      AwtComponent* parent = GetParent();
      if (container != NULL && container == parent) {
          container->SubtractInsetPoint(x, y);
      }