diff options
| author | Raluca Sauciuc <ralucas@google.com> | 2018-07-27 10:33:05 -0700 |
|---|---|---|
| committer | Raluca Sauciuc <ralucas@google.com> | 2018-07-27 10:33:05 -0700 |
| commit | 1807ee5ceb6114669fe8437cb940ed87ce05b7df (patch) | |
| tree | 2088bc09d2dcfdd57633f22037d654b0492982c5 | |
| parent | 29507af08c12d0e9c6402d7f6286f4566b090b1e (diff) | |
| parent | 98c07ecfa50e935ee1b1f7d137b0ea630ebb6e8e (diff) | |
| download | jdk8u_jdk-jetbrains-master-mirror.bakup.tar.gz | |
Update to jb8u152-b1136.39jetbrains-master-mirror.bakup
| -rw-r--r-- | src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp | 4 | ||||
| -rw-r--r-- | test/jbProblemsList.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp b/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp index ef9023b382..9003b781f8 100644 --- a/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp +++ b/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp @@ -750,8 +750,8 @@ void AwtWin32GraphicsDevice::InitDesktopScales() } } - float scaleX = dpiX / 96; - float scaleY = dpiY / 96; + int scaleX = (int)round(dpiX / 96); + int scaleY = (int)round(dpiY / 96); if (scaleX > 0 && scaleY > 0) { SetScale(scaleX, scaleY); } diff --git a/test/jbProblemsList.txt b/test/jbProblemsList.txt index 6918fb6e0f..0451e7920f 100644 --- a/test/jbProblemsList.txt +++ b/test/jbProblemsList.txt @@ -1664,4 +1664,4 @@ javax/swing/text/Utilities/8142966/SwingFontMetricsTest.java com/apple/eawt/DefaultMenuBar/DefaultMenuBarTest.java macosx-all # https://bugs.openjdk.java.net/browse/JDK-8180821 -com/apple/laf/ScreenMenu/ScreenMenuMemoryLeakTest.java macosx-all
\ No newline at end of file +com/apple/laf/ScreenMenu/ScreenMenuMemoryLeakTest.java macosx-all |