src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c

@@ -41,11 +41,11 @@
 #include <jni.h>
 #include <jni_util.h>
 #include <jvm.h>
 #include <jvm_md.h>
 #include <jlong.h>
-
+#include "systemScale.h"
 #include <stdlib.h>
 
 #include "awt_GraphicsEnv.h"
 #include "awt_util.h"
 #include "gdefs.h"

@@ -2081,21 +2081,10 @@
 
 /**
  * End DisplayMode/FullScreen support
  */
 
-int getScale(const char *name) {
-    char *uiScale = getenv(name);
-    if (uiScale != NULL) {
-        double scale = strtod(uiScale, NULL);
-        if (errno == ERANGE || scale < 1) {
-            return -1;
-        }
-        return (int) scale;
-    }
-    return -1;
-}
 
 /*
  * Class:     sun_awt_X11GraphicsDevice
  * Method:    getNativeScaleFactor
  * Signature: (I)I

@@ -2106,14 +2095,14 @@
 
     // for debug purposes
     static int scale = -2.0;
 
     if (scale == -2) {
-        scale = getScale("J2D_UISCALE");
+        scale = getNativeScaleFactor("J2D_UISCALE");
     }
 
     if (scale >= 1) {
         return scale;
     }
 
-    return getScale("GDK_SCALE");
+    return getNativeScaleFactor("GDK_SCALE");
 }