AWT Label/Button default peer preferred size

hansonr · hansonr · commit 3c85b271ab64 · 2019-07-14T14:04:53.000+01:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSButtonUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSButtonUI.java
@@ -28,8 +28,11 @@
 
 package swingjs.plaf;
 
+import java.awt.Button;
 //import java.awt.FontMetrics;
 import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Insets;
 import java.awt.event.KeyEvent;
@@ -90,7 +93,7 @@ public DOMNode updateDOMNode() {
 			isSimpleButton = true;
 			allowPaintedBackground = false;
 			setDoPropagate();
-			domNode = enableNode = buttonNode = newDOMObject("button", id + "_dom", "type", "button");
+			domNode = enableNode = buttonNode = newDOMObject("button", id + "_dom", "type", "button", "style", "padding:0");
 			//DOMNode.setStyles(domNode,"transform","translateY(0.5px)translateX(0.5px)");
 			addClass(domNode, "j2sbutton");
 			setFocusable();
@@ -795,5 +798,12 @@ public boolean isFocusable() {
 		return true;
 	}
 
-
+	@Override 
+	public Dimension getPreferredSize(JComponent jc) {
+		if (isAWT && isSimpleButton)
+			return JSLabelUI.getMinimumSizePeer(jc, button);
+		return super.getPreferredSize(jc);
+		
+	}
+	
 }
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
@@ -1937,7 +1937,7 @@ public void print(Graphics g) {
 	}
 
 	@Override
-	public final Dimension getMinimumSize() {
+	public Dimension getMinimumSize() {
 		// from ComponentPeer; convenience only
 		return getMinimumSize(jc);
 	}
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSLabelUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSLabelUI.java
@@ -1,6 +1,8 @@
 package swingjs.plaf;
 
 import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Rectangle;
 
@@ -109,7 +111,20 @@ public void paint(Graphics g, JComponent c) {
 	@Override
 	public Dimension getPreferredSize(JComponent jc) {
 		updateDOMNode();
-		return (label == null ? super.getPreferredSize(jc) : JSGraphicsUtils.getPreferredButtonSize(((AbstractButton) jc), ((AbstractButton) jc).getIconTextGap()));
+		return (isAWT ? getMinimumSizePeer(jc, label) : label == null ? super.getPreferredSize(jc) : JSGraphicsUtils.getPreferredButtonSize(((AbstractButton) jc), ((AbstractButton) jc).getIconTextGap()));
 	}
 
+	static Dimension getMinimumSizePeer(JComponent jc, Object label) {
+		Font f = jc.getFont();
+		String s = null;
+		if (f == null)
+			return new Dimension(14, 8);
+		FontMetrics fm = f.getFontMetrics();
+		s = ((JLabel) label).getText();
+		if (s == null)
+			s = "";
+		return new Dimension(fm.stringWidth(s) + 14, fm.getHeight() + 8);
+	}
+	
+
 }

Original file line number	Diff line number	Diff line change
`@@ -1937,7 +1937,7 @@ public void print(Graphics g) {`
`1937`	`1937`	`}`
`1938`	`1938`
`1939`	`1939`	`@Override`
`1940`		`- public final Dimension getMinimumSize() {`
	`1940`	`+ public Dimension getMinimumSize() {`
`1941`	`1941`	`// from ComponentPeer; convenience only`
`1942`	`1942`	`return getMinimumSize(jc);`
`1943`	`1943`	`}`