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

rev 60071 : 8211999: Window positioning bugs due to overlapping GraphicsDevice bounds (Windows/HiDPI)
Reviewed-by: XXX

*** 1,7 ****
  /*
!  * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 97,116 ****
          RECT rRW = {0, 0, 0, 0};
          Devices::InstanceAccess devices;
          AwtWin32GraphicsDevice *device = devices->GetDevice(screen);
  
          if (TRUE == MonitorBounds(AwtWin32GraphicsDevice::GetMonitor(screen), &rRW)) {
- 
-             int x = (device == NULL) ? rRW.left : device->ScaleDownX(rRW.left);
-             int y = (device == NULL) ? rRW.top  : device->ScaleDownY(rRW.top);
              int w = (device == NULL) ? rRW.right - rRW.left
                                       : device->ScaleDownX(rRW.right - rRW.left);
              int h = (device == NULL) ? rRW.bottom - rRW.top
                                       : device->ScaleDownY(rRW.bottom - rRW.top);
  
!             bounds = env->NewObject(clazz, mid, x, y, w, h);
! 
          }
          else {
              // 4910760 - don't return a null bounds, return the bounds of the
              // primary screen
              int w = ::GetSystemMetrics(SM_CXSCREEN);
--- 97,112 ----
          RECT rRW = {0, 0, 0, 0};
          Devices::InstanceAccess devices;
          AwtWin32GraphicsDevice *device = devices->GetDevice(screen);
  
          if (TRUE == MonitorBounds(AwtWin32GraphicsDevice::GetMonitor(screen), &rRW)) {
              int w = (device == NULL) ? rRW.right - rRW.left
                                       : device->ScaleDownX(rRW.right - rRW.left);
              int h = (device == NULL) ? rRW.bottom - rRW.top
                                       : device->ScaleDownY(rRW.bottom - rRW.top);
  
!             bounds = env->NewObject(clazz, mid, rRW.left, rRW.top, w, h);
          }
          else {
              // 4910760 - don't return a null bounds, return the bounds of the
              // primary screen
              int w = ::GetSystemMetrics(SM_CXSCREEN);