pixelDensity (all): allow 2x if windowed or SPAN, and any screen is 2x

JakubValtar · JakubValtar · commit 3802cd90cf77 · 2017-04-14T19:13:57.000+02:00
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
@@ -910,6 +910,8 @@ public PSurface getSurface() {
   public int pixelDensity = 1;
   int suggestedDensity = -1;
 
+  boolean present;
+
   String outputPath;
   OutputStream outputStream;
 
@@ -1127,17 +1129,17 @@ final public int sketchPixelDensity() {
   * @see PApplet#size(int,int)
   */
   public int displayDensity() {
-    if (display == SPAN) {
-      // walk through all displays, use lowest common denominator
-      for (int i = 0; i < displayDevices.length; i++) {
-        if (displayDensity(i) != 2) {
-          return 1;
-        }
+    if (display != SPAN && (fullScreen || present)) {
+      return displayDensity(display);
+    }
+    // walk through all displays, use 2 if any display is 2
+    for (int i = 0; i < displayDevices.length; i++) {
+      if (displayDensity(i+1) == 2) {
+        return 2;
       }
-      // If nobody's density is 1 (or != 2, to be exact) then everyone is 2
-      return 2;
     }
-    return displayDensity(display);
+    // If nobody's density is 2 then everyone is 1
+    return 1;
   }
 
  /**
@@ -10505,6 +10507,8 @@ public void uncaughtException(Thread t, Throwable e) {
     // (most likely set from the PDE based on a system DPI scaling)
     sketch.suggestedDensity = density;
 
+    sketch.present = present;
+
     // For 3.0.1, moved this above handleSettings() so that loadImage() can be
     // used inside settings(). Sets a terrible precedent, but the alternative
     // of not being able to size a sketch to an image is driving people loopy.
