java2script
diff --git a/‎sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip‎
105 Bytes b/‎sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip‎
105 Bytes
diff --git a/‎sources/net.sf.j2s.core/dist/swingjs/timestamp‎
Lines changed: 1 addition & 5 deletions b/‎sources/net.sf.j2s.core/dist/swingjs/timestamp‎
Lines changed: 1 addition & 5 deletions
diff --git a/‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip‎
105 Bytes b/‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip‎
105 Bytes
diff --git a/‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp‎
Lines changed: 1 addition & 5 deletions b/‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp‎
Lines changed: 1 addition & 5 deletions
diff --git a/‎sources/net.sf.j2s.java.core/dist/SwingJS-site.zip‎
105 Bytes b/‎sources/net.sf.j2s.java.core/dist/SwingJS-site.zip‎
105 Bytes
diff --git a/‎sources/net.sf.j2s.java.core/src/swingjs/plaf/JSRadioButtonUI.java‎
Lines changed: 6 additions & 3 deletions b/‎sources/net.sf.j2s.java.core/src/swingjs/plaf/JSRadioButtonUI.java‎
Lines changed: 6 additions & 3 deletions
@@ -1,5 +1 @@
-<<<<<<< HEAD
-20181117143423 
-=======
-20181117133636 
->>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script.git
+20181117145755 
@@ -1,5 +1 @@
-<<<<<<< HEAD
-20181117143423 
-=======
-20181117133636 
->>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script.git
+20181117145755 
@@ -92,8 +92,8 @@ protected void setupButton(JToggleButton b, boolean doAll) {
 		DOMNode.setStyles(iconNode, "position", null);
 		DOMNode.setStyles(textNode, "position", null);
 		Dimension dim = null;
-		dim = setHTMLSize1(wrap("div", "", iconNode, textNode), false, false);
 		vCenter(iconNode, (actionNode == null ? -15 : isMenuItem ? -110 : -75), isMenuItem ? 0.6f : 0);
+		dim = setHTMLSize1(wrap("div", "", iconNode, textNode), false, false);
 		vCenter(textNode, -50, 0);
 		setHorizontalButtonAlignments(b, b.getHorizontalTextPosition(), b.getHorizontalAlignment());
 		if (!isMenuItem) { // only problem here is menu width 
@@ -103,8 +103,11 @@ protected void setupButton(JToggleButton b, boolean doAll) {
 		if (doAll && !isMenuItem)
 			DOMNode.setPositionAbsolute(domNode);
 		if (dim != null) {
-			DOMNode.setSize(buttonNode, dim.width, dim.height);
-			DOMNode.setSize(centeringNode, dim.width, dim.height);
+			int ht = (isMenuItem ? c.getFont().getSize() + 3 : 36);
+			if (ht > 18)
+				ht = dim.height;
+			DOMNode.setSize(buttonNode, dim.width, ht);
+			DOMNode.setSize(centeringNode, dim.width, ht);
 		}
 	}