--- old/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp	2015-10-22 07:47:30.988389900 -0700
+++ new/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp	2015-10-22 07:47:30.675864600 -0700
@@ -2355,8 +2355,13 @@
 {
     TRY;
 
-    return ::GetSystemMetrics(SM_CXSCREEN);
+    int width = ::GetSystemMetrics(SM_CXSCREEN);
 
+    Devices::InstanceAccess devices;
+    AwtWin32GraphicsDevice *device = devices->GetDevice(
+                        AwtWin32GraphicsDevice::GetDefaultDeviceIndex());
+    
+    return (device == NULL) ? width : device->ScaleDownX(width); 
     CATCH_BAD_ALLOC_RET(0);
 }
 
@@ -2370,7 +2375,12 @@
 {
     TRY;
 
-    return ::GetSystemMetrics(SM_CYSCREEN);
+    int height = ::GetSystemMetrics(SM_CYSCREEN);
+    Devices::InstanceAccess devices;
+    AwtWin32GraphicsDevice *device = devices->GetDevice(
+                        AwtWin32GraphicsDevice::GetDefaultDeviceIndex());
+    
+    return (device == NULL) ? height : device->ScaleDownY(height); 
 
     CATCH_BAD_ALLOC_RET(0);
 }