change how size(displayWidth, displayHeight) works (fixes processing#3545)

benfry · benfry · commit f0691c08abdc · 2015-08-07T10:06:08.000-04:00
diff --git a/app/src/processing/app/ui/Editor.java b/app/src/processing/app/ui/Editor.java
@@ -2985,6 +2985,11 @@ public void statusError(Exception e) {
       if (mess.startsWith(illString)) {
         mess = mess.substring(illString.length());
       }
+      // This is confusing and common with the size() and fullScreen() changes
+      String illState = "IllegalStateException: ";
+      if (mess.startsWith(illState)) {
+        mess = mess.substring(illState.length());
+      }
       statusError(mess);
     }
 //    e.printStackTrace();
diff --git a/core/src/processing/awt/PSurfaceAWT.java b/core/src/processing/awt/PSurfaceAWT.java
@@ -422,13 +422,19 @@ public void initFrame(final PApplet sketch) {/*, int backgroundColor,
     sketchHeight = sketch.sketchHeight();
 
     boolean fullScreen = sketch.sketchFullScreen();
+    // Removing the section below because sometimes people want to do the
+    // full screen size in a window, and it also breaks insideSettings().
+    // With 3.x, fullScreen() is so easy, that it's just better that way.
+    // https://github.com/processing/processing/issues/3545
+    /*
     // Sketch has already requested to be the same as the screen's
     // width and height, so let's roll with full screen mode.
     if (screenRect.width == sketchWidth &&
         screenRect.height == sketchHeight) {
       fullScreen = true;
       sketch.fullScreen();  // won't change the renderer
     }
+    */
 
     if (fullScreen || spanDisplays) {
       sketchWidth = screenRect.width;
diff --git a/core/src/processing/opengl/PSurfaceJOGL.java b/core/src/processing/opengl/PSurfaceJOGL.java
@@ -273,13 +273,19 @@ protected void initWindow() {
     sketchHeight = sketch.sketchHeight();
 
     boolean fullScreen = sketch.sketchFullScreen();
+    // Removing the section below because sometimes people want to do the
+    // full screen size in a window, and it also breaks insideSettings().
+    // With 3.x, fullScreen() is so easy, that it's just better that way.
+    // https://github.com/processing/processing/issues/3545
+    /*
     // Sketch has already requested to be the same as the screen's
     // width and height, so let's roll with full screen mode.
     if (screenRect.width == sketchWidth &&
         screenRect.height == sketchHeight) {
       fullScreen = true;
       sketch.fullScreen();
     }
+    */
 
     if (fullScreen || spanDisplays) {
       sketchWidth = screenRect.width;
diff --git a/core/todo.txt b/core/todo.txt
@@ -1,4 +1,7 @@
-0240 core (beta 2)
+0240 core (3.0b2)
+X make size(displayWidth, displayHeight) still run in a window
+X   prevents "fullScreen() cannot be used here" message on startup
+X   https://github.com/processing/processing/issues/3545
 
 
 docs
diff --git a/todo.txt b/todo.txt
@@ -1,4 +1,7 @@
 0240 (3.0b2)
+_ if no platforms selected in export, will still say "done exporting!"
+_   maybe if none selected, should default select the current platform
+_   why are none selected in the first place? not getting saved?
 
 
 3.0 final

Original file line number	Diff line number	Diff line change
`@@ -2985,6 +2985,11 @@ public void statusError(Exception e) {`
`2985`	`2985`	`if (mess.startsWith(illString)) {`
`2986`	`2986`	`mess = mess.substring(illString.length());`
`2987`	`2987`	`}`
	`2988`	`+ // This is confusing and common with the size() and fullScreen() changes`
	`2989`	`+ String illState = "IllegalStateException: ";`
	`2990`	`+ if (mess.startsWith(illState)) {`
	`2991`	`+ mess = mess.substring(illState.length());`
	`2992`	`+ }`
`2988`	`2993`	`statusError(mess);`
`2989`	`2994`	`}`
`2990`	`2995`	`// e.printStackTrace();`