logic error in invalidate(); isContentPane issue

hansonr · hansonr · commit 599b5078fdbe · 2019-01-29T01:53:14.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/Component.java b/sources/net.sf.j2s.java.core/src/java/awt/Component.java
@@ -2679,7 +2679,7 @@ protected void invalidateComp() {
 		if (!isMaximumSizeSet()) {
 			maxSize = null;
 		}
-		if (parent != null && !_j2sInvalidateOnAdd) {
+		if (parent != null && _j2sInvalidateOnAdd) {
 			parent.invalidateIfValid();
 		}
 		// }
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
@@ -687,10 +687,11 @@ protected void paintChildren(Graphics g) {
 				// and probably not do this.
 				// SwingJS TODO -- allow JSpecView-like layer for writing over buttons
 				if (jc != null && jc.isVisible()) {
-					jc.getBounds(tmpRect);					
+					jc.getBounds(tmpRect);
+					boolean isContentPane = jc.getRootPane().getContentPane() == jc;
 					Rectangle vr = (jc instanceof JTable ? jc.getVisibleRect() : tmpRect);
 					JSGraphics2D jsg = (JSGraphics2D) (Object) sg.create(tmpRect.x, 
-							(jc.isContentPane ? 0 : tmpRect.y), vr.width, vr.height); 
+							(isContentPane ? 0 : tmpRect.y), vr.width, vr.height); 
 					jsg.setColor(jc.getForeground());
 					jsg.setFont(jc.getFont());
 					boolean shouldSetFlagBack = false;

Original file line number	Diff line number	Diff line change
`@@ -2679,7 +2679,7 @@ protected void invalidateComp() {`
`2679`	`2679`	`if (!isMaximumSizeSet()) {`
`2680`	`2680`	`maxSize = null;`
`2681`	`2681`	`}`
`2682`		`- if (parent != null && !_j2sInvalidateOnAdd) {`
	`2682`	`+ if (parent != null && _j2sInvalidateOnAdd) {`
`2683`	`2683`	`parent.invalidateIfValid();`
`2684`	`2684`	`}`
`2685`	`2685`	`// }`