adds JSComponent.isWindowOrJSApplet(), selfOrChildIsPainted()

hansonr · hansonr · commit b70b00c6c7ec · 2019-02-28T15:54:43.000-06: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
@@ -105,6 +105,11 @@ public static void ensurePropertyChangeListener(Component c, Component listener)
 		}
 	}
 
+	/**
+	 * Note that the length of this array may be longer than getComponentCount()
+	 * @param c
+	 * @return
+	 */
 	public static Component[] getChildArray(Container c) {
 		return (c == null ? Container.EMPTY_ARRAY : c.getChildArray());
 	}
@@ -137,6 +142,18 @@ public static Component[] getChildArray(Container c) {
 	 * 
 	 */
 	public boolean _isBackgroundPainted;
+	protected boolean _alwaysPaint;
+
+	public boolean selfOrChildIsPainted() {
+		if (_alwaysPaint || _isBackgroundPainted)
+			return true;
+		Component[] a = JSComponent.getChildArray((Container) this);
+		for (int i = ((Container) this).getComponentCount(); --i >= 0;)
+			if (((JSComponent) a[i]).selfOrChildIsPainted())
+				return true;
+		return false;
+	}
+
 
 	private Insets tempInsets;
 	public JSGraphics2D _gtemp; // indicates that we are painting, so that g.setBackground() should also be set 
@@ -282,7 +299,7 @@ public void checkBackgroundPainted(JSGraphics2D jsg, boolean init) {
 			return;
 		}
 		_gtemp = null;
-		_isBackgroundPainted = jsg.isBackgroundPainted();
+		_isBackgroundPainted = _alwaysPaint || jsg.isBackgroundPainted();
 		if (_isBackgroundPainted) {
 			((JSComponentUI) ui).setPainted(jsg);
 			// It's all one canvas, and it is behind the root pane (bad design?)
@@ -434,9 +451,7 @@ public void removeKeyListener(KeyListener l) {
  	 */
  	public static Container getTopInvokableAncestor(Component c, boolean andFocusable) {
  	    for(Component p = c; p != null; p = nextHigher(p)) { 
- 	        if (p instanceof Window && (!andFocusable || ((Window)p).isFocusableWindow()) 
- 	        		|| p instanceof JSApplet
- 	            ) {
+ 	        if (p.isWindowOrJSApplet() && (!andFocusable || ((Window)p).isFocusableWindow())) {
  	            return (Container) p;
  	        }
  	    }
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
@@ -2,53 +2,53 @@
 
 import java.awt.Color;
 import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.awt.GraphicsConfiguration;
 
-
 public class Canvas extends Panel {
-	
-	public void isAWT() {}
-	
-	public Canvas() {
-		super();
-	}
-	
+
 	public Canvas(GraphicsConfiguration config) {
+		this();
+	}
+
+	public Canvas() {
 		super();
+		_alwaysPaint = true;
 	}
-	
+
 	@Override
 	public void setBackground(Color c) {
 		super.setBackground(c);
 		setOpaque(c != null);
 	}
 
-	
 	@Override
 	public void paint(Graphics g) {
-      g.clearRect(0, 0, width, height);
-  
-	// see	http://www.oracle.com/technetwork/java/painting-140037.html#awt_summary
-			
-	//BH AWT called canvas.update(g), but Swing will call canvas.paint(g) instead. 
-	//BH a2s does allow for that, with paint(g) calling update(g) (Opposite of standard Swing).
-		
-	//BH So in the code, canvas.paint should be renamed something like canvas.paintMe
-		
-		
+		((Graphics2D) g).setBackground(getBackground());
+		g.clearRect(0, 0, width, height);
+
+		// see http://www.oracle.com/technetwork/java/painting-140037.html#awt_summary
+
+		// BH AWT called canvas.update(g), but Swing will call canvas.paint(g) instead.
+		// BH a2s does allow for that, with paint(g) calling update(g) (Opposite of
+		// standard Swing).
+
+		// BH So in the code, canvas.paint should be renamed something like
+		// canvas.paintMe
+
 		update(g);
 	}
 
-	private boolean notified;
+//	private boolean notified;
 	@SuppressWarnings("unused")
 	@Override
 	public void update(Graphics g) {
-		if (!notified)
-			System.out.println("neither paint(g) nor update(g) is implemented for " + this);
-		notified = true;
-		if (/** @j2sNative this.paintComponent$java_awt_Graphics || */false)
+//		if (!notified && JSUtil.is)
+//			System.out.println("neither paint(g) nor update(g) is implemented for " + this);
+//		notified = true;
+	       		if (/** @j2sNative this.paintComponent$java_awt_Graphics || */
+		false)
 			paintComponent(g);
 	}
 
-
 }
