allow Label/JLabel and other components to paint independently

hansonr · hansonr · commit 269ff25952ee · 2019-06-13T23:12:09.000+02:00
as long as they do not override paint(Graphics) in JComponent.
Otherwise any change to a label triggers a full repaint of their
containing frame.
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
@@ -45,6 +45,7 @@
 import swingjs.JSAppletViewer;
 import swingjs.JSFrameViewer;
 import swingjs.JSGraphics2D;
+import swingjs.JSUtil;
 import swingjs.api.js.HTML5Canvas;
 import swingjs.plaf.JSComponentUI;
 
@@ -524,6 +525,38 @@ public void removeKeyListener(KeyListener l) {
         return 秘isFocusableSet && isFocusable();
     }
 
+    /**
+     * will be set to 1 if paint(graphics) is found to be overridden, signally that
+     * we can't depend upon this component to be drawn by itself; JLabel will
+     * also set this to 1 if there there is an icon
+     * 
+     */
+    protected int 秘paintOverridden = 0;
+
+	/**
+	 * A component in SwingJS can paint immediately if it is opaque (as in Java) or
+	 * if its paint(Graphics) method is not overridden. Note that AWT Applet and Panel 
+	 * do override paint(graphics)
+	 * 
+	 * @return
+	 */
+	public boolean canPaintImmediately() {
+		if (isOpaque())
+			return true;
+		if (秘paintOverridden == 0) {
+			if (((Container) this).getComponentCount() != 0) {
+				秘paintOverridden = -1;
+			} else {
+				Object f = JSUtil.getJ2SAlias(this, "paint$java_awt_Graphics");
+				秘paintOverridden = (JSUtil.isOverridden(f, JComponent.class) ? 1 : -1);
+			}
+		}
+		// TODO -- still need to set RepaintManager so that
+		// objects with the same paintable root can be grouped together.
+		
+		return (秘paintOverridden == -1);
+	}
+
 
 
 }
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
@@ -4347,7 +4347,7 @@ public void paintImmediately(int x, int y, int w, int h) {
 			return;
 		}
 
-		while (!((JComponent) c).isOpaque()) {
+		while (!((JSComponent)c).canPaintImmediately()) {
 			parent = c.getParent();
 			if (parent != null) {
 				x += c.getX();
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JLabel.java b/sources/net.sf.j2s.java.core/src/javax/swing/JLabel.java
@@ -330,6 +330,8 @@ public Icon getIcon() {
     public void setIcon(Icon icon) {
         Icon oldValue = defaultIcon;
         defaultIcon = icon;
+        if (defaultIcon != null)
+        	秘paintOverridden = 1;
 
         /* If the default icon has really changed and we had
          * generated the disabled icon for this component

Original file line number	Diff line number	Diff line change
`@@ -4347,7 +4347,7 @@ public void paintImmediately(int x, int y, int w, int h) {`
`4347`	`4347`	`return;`
`4348`	`4348`	`}`
`4349`	`4349`
`4350`		`- while (!((JComponent) c).isOpaque()) {`
	`4350`	`+ while (!((JSComponent)c).canPaintImmediately()) {`
`4351`	`4351`	`parent = c.getParent();`
`4352`	`4352`	`if (parent != null) {`
`4353`	`4353`	`x += c.getX();`