fixes for paint path

hansonr · hansonr · commit 227b8b220cf4 · 2019-08-29T12:44:37.000-05:00
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
@@ -273,7 +273,7 @@ public Graphics getGraphics() {
 	@Override
 	public void addNotify() {
 		if (秘paintsSelf() && ui != null) // BoxFiller will not have a ui? 
-			((JSComponentUI) ui).clearPaintPath();	
+			((JSComponentUI) ui).clearPaintPath();
 		super.addNotify();
 	}
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/Canvas.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/Canvas.java
@@ -4,6 +4,7 @@
 import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.GraphicsConfiguration;
+import java.awt.JSComponent;
 
 public class Canvas extends Panel {
 
@@ -18,6 +19,7 @@ public Canvas() {
 		秘paintClass = 秘updateClass = /**@j2sNative C$ || */null;
 	}
 
+	
 	@Override
 	public Dimension getPreferredSize() {
 		// must bypass JComponent here because we subclass Panel
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSComponentUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSComponentUI.java
@@ -472,6 +472,11 @@ public void setDraggable(JSFunction f) {
 	 * indicates not to add it to the DOM
 	 */
 	private boolean isPaintedOnly;
+
+	/**
+	 * container is between the HTML5 canvas and a component that paints itself
+	 */
+	private boolean inPaintPath;
 	
 
 	/**
@@ -3386,7 +3391,7 @@ public void setBackground(Color c) {
 	}
 	
 	private Color backgroundColor;
-	
+
 	protected void setBackgroundImpl(Color color) {
 		// Don't allow color for Menu and MenuItem. This is taken care of by
 		// jQuery
@@ -3413,7 +3418,7 @@ private void checkTransparent() {
 		// Here we keep it simple and do the change immediately.
 		//
 
-		if (domNode != null && (cellComponent != null || !c.isOpaque()))
+		if (inPaintPath || domNode != null && (cellComponent != null || !c.isOpaque()))
 			setTransparent();
 	}
 
@@ -3462,6 +3467,9 @@ protected void setBackgroundDOM(DOMNode node, Color color) {
 	public void clearPaintPath() {
 		JSComponent c = jc;
 		while (c != null) {
+			((JSComponentUI) c.ui).inPaintPath = true;
+
+			c.秘setPaintsSelf(JSComponent.PAINTS_SELF_ALWAYS);
 			((JSComponentUI) c.ui).setTransparent();
 			c = c.getParent();
 		}

Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ public Graphics getGraphics() {`
`273`	`273`	`@Override`
`274`	`274`	`public void addNotify() {`
`275`	`275`	`if (秘paintsSelf() && ui != null) // BoxFiller will not have a ui?`
`276`		`- ((JSComponentUI) ui).clearPaintPath();`
	`276`	`+ ((JSComponentUI) ui).clearPaintPath();`
`277`	`277`	`super.addNotify();`
`278`	`278`	`}`
`279`	`279`