eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-01-27 10:21:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolves preproc issue related to #352.

Browse Source
This commit is contained in:
A Pottinger
2022-02-03 08:57:37 -08:00
parent 220061ff3d
commit 477508a971
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java/src/processing/mode/java/preproc/PdeParseTreeListener.java
View File

@@ -78,6 +78,7 @@ public class PdeParseTreeListener extends ProcessingBaseListener {
private String pixelDensity;
private String smoothParam;
private String sketchRenderer = null;
private String fullscreenArgs = "";
private String sketchOutputFilename = null;
private boolean sizeRequiresRewrite = false;
@@ -720,9 +721,17 @@ public class PdeParseTreeListener extends ProcessingBaseListener {
thisRequiresRewrite = true;
sizeIsFullscreen = true;
StringJoiner fullscreenArgsBuilder = new StringJoiner(", ");
if (argsContext.getChildCount() > 0) {
sketchRenderer = argsContext.getChild(0).getText();
fullscreenArgsBuilder.add(argsContext.getChild(0).getText());
}
if (argsContext.getChildCount() > 2) {
fullscreenArgsBuilder.add(argsContext.getChild(2).getText());
}
fullscreenArgs = fullscreenArgsBuilder.toString();
}
if (thisRequiresRewrite) {
@@ -1153,8 +1162,7 @@ public class PdeParseTreeListener extends ProcessingBaseListener {
if (sizeRequiresRewrite) {
if (sizeIsFullscreen) {
String fullscreenInner = sketchRenderer == null ? "" : sketchRenderer;
settingsInner.add(String.format("fullScreen(%s);", fullscreenInner));
settingsInner.add(String.format("fullScreen(%s);", fullscreenArgs));
} else {
if (sketchWidth.isEmpty() || sketchHeight.isEmpty()) {

2
java/test/resources/fullscreen_arg.expected
View File

@@ -12,7 +12,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.io.IOException;
public class fullscreen extends PApplet {
public class fullscreen_arg extends PApplet {
public void setup() {
/* size commented out by preprocessor */;