fixing g.fill3dRect() and width of centered tag can be too small

hansonr · hansonr · commit 35b81b1d0074 · 2018-09-18T11:56:00.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSGraphics2D.java b/sources/net.sf.j2s.java.core/src/swingjs/JSGraphics2D.java
@@ -35,6 +35,7 @@
 import swingjs.api.js.HTML5Canvas;
 import swingjs.api.js.HTML5CanvasContext2D;
 
+// BH 9/18/2018 fill3DRect fix
 // BH 6/2018 adds g.copyArea(x,y,width,height,dx,dy)
 
 /**
@@ -261,7 +262,7 @@ public void fill3DRect(int x, int y, int width, int height, boolean raised) {
 		do3DRect(x, y, width, height, raised, true);
 	}
 
-	private void do3DRect(int x, int y, int width2, int height2, boolean raised, boolean isFill) {
+	private void do3DRect(int x, int y, int width, int height, boolean raised, boolean isFill) {
 		if (width <= 0 || height <= 0)
 			return;
 		Paint p = getPaint();
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
@@ -1561,6 +1561,7 @@ protected void setHorizontalButtonAlignments(JComponent b, int pos, int align) {
 		
 //		DOMNode.setAttr(textNode,  "innerHTML", pos);
 		
+		
 		int wIcon = Math.max(0, setHTMLSize1(iconNode, false, false).width - 1);
 		int wText = setHTMLSize1(textNode, false, false).width - 1;
 
@@ -1644,8 +1645,12 @@ protected void setHorizontalButtonAlignments(JComponent b, int pos, int align) {
 
 		DOMNode.setPositionAbsolute(iconNode);
 		DOMNode.setPositionAbsolute(textNode);
-		if (buttonNode != null)
+		if (buttonNode != null) {
 			DOMNode.setPositionAbsolute(buttonNode);
+		} else if (centeringNode != null) {
+			// See test/Puzzle.java
+				DOMNode.setStyles(centeringNode, "width", "100%");
+		}
 
 	}
 
diff --git a/sources/net.sf.j2s.java.core/src/test/Puzzle.java b/sources/net.sf.j2s.java.core/src/test/Puzzle.java
