RepaintManager fix for background check in JApplet for direct pixel

hansonr · hansonr · commit 44c9cfb11e60 · 2018-09-16T18:35:59.000-05:00
writing.
diff --git a/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20180916165130 
+20180916182707 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.2/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.2/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.2/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.2/timestamp
@@ -1 +1 @@
-20180916165130 
+20180916182707 
diff --git a/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip b/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/JSComponent.java b/sources/net.sf.j2s.java.core/src/java/awt/JSComponent.java
@@ -318,4 +318,17 @@ public void validateComponent() {
 	  
   }
 
+    /**
+     * Paint this component, checking to see if the background got painted, and if so, make the 
+     * div background transparent so that that underlying HTML5 canvas shows through.
+     *  
+     * @param g
+     */
+	public void paintWithBackgroundCheck(Graphics g) {
+		checkBackgroundPainted(null);
+		paint(g);					
+		checkBackgroundPainted(getJSGraphic2D(g));
+	}
+
+
 }
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JComponent.java b/sources/net.sf.j2s.java.core/src/javax/swing/JComponent.java
@@ -4573,9 +4573,7 @@ void _paintImmediately(int x, int y, int w, int h) {
 					// jpanel.repaint() and then draws on the background,
 					// the JPanel's background is made transparent
 					// (so that the underlying JRootPane canvas can show).
-					checkBackgroundPainted(null);
-					paintingComponent.paint(g);					
-					checkBackgroundPainted(getJSGraphic2D(g));
+					paintingComponent.paintWithBackgroundCheck(g);
 				}
 			} finally {
 				g.dispose();
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/RepaintManager.java b/sources/net.sf.j2s.java.core/src/javax/swing/RepaintManager.java
@@ -870,7 +870,7 @@ private void paintDirtyRegions1(
 					if (g != null) {
 						// SwingJS not clipping, for performance g.setClip(rect.x, rect.y, rect.width, rect.height);
 						try {
-							((Container) dirtyComponent).paint(g); // SwingJS was paintContainer, but that bypasses user's paint(g)?? 9/15/18
+							((Container) dirtyComponent).paintWithBackgroundCheck(g); // SwingJS was paintContainer, but that bypasses user's paint(g) and does not do the background check?? 9/15/18
 						} finally {
 							g.dispose();
 						}
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSGraphics2D.java b/sources/net.sf.j2s.java.core/src/swingjs/JSGraphics2D.java
@@ -498,6 +498,7 @@ public boolean drawImagePriv(Image img, int x, int y, ImageObserver observer) {
 
 	public void drawDirectRGBA(int[] pixels) {
 		// this can go VERY fast - for writing directly to the canvas context
+		backgroundPainted = true;
 		drawDirect(pixels, 0, 0, width, height, false);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -870,7 +870,7 @@ private void paintDirtyRegions1(`
`870`	`870`	`if (g != null) {`
`871`	`871`	`// SwingJS not clipping, for performance g.setClip(rect.x, rect.y, rect.width, rect.height);`
`872`	`872`	`try {`
`873`		`- ((Container) dirtyComponent).paint(g); // SwingJS was paintContainer, but that bypasses user's paint(g)?? 9/15/18`
	`873`	`+ ((Container) dirtyComponent).paintWithBackgroundCheck(g); // SwingJS was paintContainer, but that bypasses user's paint(g) and does not do the background check?? 9/15/18`
`874`	`874`	`} finally {`
`875`	`875`	`g.dispose();`
`876`	`876`	`}`
Original file line number	Diff line number	Diff line change
`@@ -498,6 +498,7 @@ public boolean drawImagePriv(Image img, int x, int y, ImageObserver observer) {`
`498`	`498`
`499`	`499`	`public void drawDirectRGBA(int[] pixels) {`
`500`	`500`	`// this can go VERY fast - for writing directly to the canvas context`
	`501`	`+ backgroundPainted = true;`
`501`	`502`	`drawDirect(pixels, 0, 0, width, height, false);`
`502`	`503`	`}`
`503`	`504`