can re-enable fill/stroke in PShapeOpenGL (fixes processing#3808)

codeanticode · codeanticode · commit e65bb375f989 · 2015-09-18T18:09:37.000-05:00
diff --git a/core/src/processing/opengl/PShapeOpenGL.java b/core/src/processing/opengl/PShapeOpenGL.java
@@ -1799,8 +1799,8 @@ public void setFill(boolean fill) {
         PShapeOpenGL child = (PShapeOpenGL) children[i];
         child.setFill(fill);
       }
-    } else if (this.fill && !fill) {
-      setFillImpl(0x0);
+    } else if (this.fill != fill) {
+      markForTessellation();
     }
     this.fill = fill;
   }
@@ -1981,16 +1981,9 @@ public void setStroke(boolean stroke) {
         child.setStroke(stroke);
       }
     } else if (this.stroke != stroke) {
-      if (this.stroke) {
-        // Disabling stroke on a shape previously with
-        // stroke needs a re-tessellation in order to remove
-        // the additional geometry of lines and/or points.
-        markForTessellation();
-        stroke = false;
-      }
-      setStrokeImpl(0x0);
+      markForTessellation();
       if (is2D() && parent != null) {
-        ((PShapeOpenGL)parent).strokedTexture(false);
+        ((PShapeOpenGL)parent).strokedTexture(stroke && image != null);
       }
     }
     this.stroke = stroke;
diff --git a/core/src/processing/opengl/PSurfaceJOGL.java b/core/src/processing/opengl/PSurfaceJOGL.java
@@ -297,6 +297,21 @@ protected void initWindow() {
     sketch.displayWidth = screenRect.width;
     sketch.displayHeight = screenRect.height;
 
+    if (sketch.displayWidth < sketch.width ||
+      sketch.displayHeight < sketch.height) {
+      int w = sketch.width;
+      int h = sketch.height;
+      if (sketch.displayWidth < w) {
+        w = sketch.displayWidth;
+      }
+      if (sketch.displayHeight < h) {
+        h = sketch.displayHeight;
+      }
+//      sketch.setSize(w, h - 22 - 2);
+//      graphics.setSize(w, h - 22 - 22);
+      System.err.println("setting width/height to " + w + " "  + h);
+    }
+
     sketchWidth = sketch.sketchWidth();
     sketchHeight = sketch.sketchHeight();
 

Original file line number	Diff line number	Diff line change
`@@ -1799,8 +1799,8 @@ public void setFill(boolean fill) {`
`1799`	`1799`	`PShapeOpenGL child = (PShapeOpenGL) children[i];`
`1800`	`1800`	`child.setFill(fill);`
`1801`	`1801`	`}`
`1802`		`- } else if (this.fill && !fill) {`
`1803`		`- setFillImpl(0x0);`
	`1802`	`+ } else if (this.fill != fill) {`
	`1803`	`+ markForTessellation();`
`1804`	`1804`	`}`
`1805`	`1805`	`this.fill = fill;`
`1806`	`1806`	`}`
`@@ -1981,16 +1981,9 @@ public void setStroke(boolean stroke) {`
`1981`	`1981`	`child.setStroke(stroke);`
`1982`	`1982`	`}`
`1983`	`1983`	`} else if (this.stroke != stroke) {`
`1984`		`- if (this.stroke) {`
`1985`		`- // Disabling stroke on a shape previously with`
`1986`		`- // stroke needs a re-tessellation in order to remove`
`1987`		`- // the additional geometry of lines and/or points.`
`1988`		`- markForTessellation();`
`1989`		`- stroke = false;`
`1990`		`- }`
`1991`		`- setStrokeImpl(0x0);`
	`1984`	`+ markForTessellation();`
`1992`	`1985`	`if (is2D() && parent != null) {`
`1993`		`- ((PShapeOpenGL)parent).strokedTexture(false);`
	`1986`	`+ ((PShapeOpenGL)parent).strokedTexture(stroke && image != null);`
`1994`	`1987`	`}`
`1995`	`1988`	`}`
`1996`	`1989`	`this.stroke = stroke;`