don't query window's surface scale if graphics are not retina

codeanticode · codeanticode · commit 96d8859cb925 · 2015-05-30T20:27:41.000-04:00
diff --git a/core/src/processing/opengl/PSurfaceJOGL.java b/core/src/processing/opengl/PSurfaceJOGL.java
@@ -523,8 +523,14 @@ public void setSize(int width, int height) {
   }
 
   public float getPixelScale() {
-    window.getCurrentSurfaceScale(currentPixelScale);
-    return currentPixelScale[0];
+    if (graphics.is2X()) {
+      // Even if the graphics are retina, the user might have moved the window
+      // into a non-retina monitor, so we need to check
+      window.getCurrentSurfaceScale(currentPixelScale);
+      return currentPixelScale[0];
+    } else {
+      return 1;
+    }
   }
 
   public Component getComponent() {
