Merge branch 'master' of https://github.com/BobHanson/java2script.git

BobHanson · BobHanson · commit fef1a1a124e6 · 2018-06-19T10:13:19.000+01:00
diff --git a/sources/net.sf.j2s.java.core/SwingJS-site.zip b/sources/net.sf.j2s.java.core/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSGraphics2D.java b/sources/net.sf.j2s.java.core/src/swingjs/JSGraphics2D.java
@@ -145,6 +145,8 @@ public void fillArc(int centerX, int centerY, int width, int height, int startAn
 	}
 
 	private void doCirc(int left, int top, int diameter, boolean fill) {
+		if (diameter <= 0)
+			return;
 		double r = diameter / 2f;
 		ctx.beginPath();
 		ctx.arc(left + r, top + r, r, 0, 2 * Math.PI, false);
@@ -157,6 +159,8 @@ private void doCirc(int left, int top, int diameter, boolean fill) {
 
 	private void doArc(double x, double y, double width, double height, double startAngle,
 			double arcAngle, boolean fill) {
+		if (width <= 0 || height <= 0)
+			return;
 //		boolean doClose = (arcAngle - startAngle == 360);
 		ctx.save();
 		{
@@ -230,6 +234,8 @@ private void doPoly(int[] axPoints, int[] ayPoints, int nPoints,
 
 	
 	public void drawRect(int x, int y, int width, int height) {
+		if (width <= 0 || height <= 0)
+			return;
 		ctx.beginPath();
 		ctx.rect(x, y, width, height);
 		ctx.stroke();
@@ -245,11 +251,15 @@ public void fillPolygon(int[] axPoints, int[] ayPoints, int nPoints) {
 
 	
 	public void fillRect(int x, int y, int width, int height) {
+		if (width <= 0 || height <= 0)
+			return;
 		backgroundPainted = true;
 		ctx.fillRect(x, y, width, height);
 	}
 
 	public void fill3DRect(int x, int y, int width, int height, boolean raised) {
+		if (width <= 0 || height <= 0)
+			return;
 		Paint p = getPaint();
 		Color c = getColor();
 		Color brighter = c.brighter();
@@ -374,6 +384,8 @@ public boolean drawImage(Image img, int x, int y, ImageObserver observer) {
 	
 	public boolean drawImage(Image img, int x, int y, int width, int height,
 			ImageObserver observer) {
+		if (width <= 0 || height <= 0)
+			return true;
 		backgroundPainted = true;
 		if (img != null) {
 			DOMNode imgNode = getImageNode(img);
@@ -406,6 +418,8 @@ public boolean drawImage(Image img, int x, int y, Color bgcolor,
 	
 	public boolean drawImage(Image img, int x, int y, int width, int height,
 			Color bgcolor, ImageObserver observer) {
+		if (width <= 0 || height <= 0)
+			return false;
 		backgroundPainted = true;
 		JSUtil.notImplemented(null);
 		return drawImage(img, x, y, width, height, observer);
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
@@ -649,9 +649,19 @@ public void stateChanged(ChangeEvent e) {
 	@Override
 	public void propertyChange(PropertyChangeEvent e) {
 		String prop = e.getPropertyName();
-		if (isDisposed && c.visible && prop == "ancestor"
-				&& e.getNewValue() != null)
-			setVisible(true);
+		if (prop == "ancestor") {
+			JSComponentUI parentui = this;
+			/**
+			 * @j2sNative
+			 * 
+			 * 			parentui = this.jc.parent && this.jc.parent.getUI &&
+			 *            this.jc.parent.getUI();
+			 */
+			if (parentui != null)
+				parentui.setTainted();
+			if (isDisposed && c.visible && e.getNewValue() != null)
+				setVisible(true);
+		}
 		propertyChangedCUI(prop);
 	}
 
