modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGCanvas.java

@@ -23,11 +23,10 @@
  * questions.
  */
 
 package com.sun.javafx.sg.prism;
 
-import com.sun.glass.ui.Screen;
 import javafx.geometry.VPos;
 import javafx.scene.text.Font;
 import java.nio.IntBuffer;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.FutureTask;

@@ -353,13 +352,14 @@
     public NGCanvas() {
         Toolkit tk = Toolkit.getToolkit();
         ScreenConfigurationAccessor screenAccessor = tk.getScreenConfigurationAccessor();
         float hPS = 1.0f;
         for (Object screen : tk.getScreens()) {
-            hPS = Math.max(screenAccessor.getRenderScale(screen), hPS);
+            hPS = Math.max(screenAccessor.getRecommendedOutputScaleX(screen), hPS);
+            hPS = Math.max(screenAccessor.getRecommendedOutputScaleY(screen), hPS);
         }
-        highestPixelScale = hPS;
+        highestPixelScale = (float) Math.ceil(hPS);
 
         cv = new RenderBuf(InitType.PRESERVE_UPPER_LEFT);
         temp = new RenderBuf(InitType.CLEAR);
         clip = new RenderBuf(InitType.FILL_WHITE);