Fixes AWT Label("") not still having height

hansonr · hansonr · commit 1d27a62e3fee · 2019-02-04T18:05:05.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/Label.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/Label.java
@@ -4,6 +4,9 @@
 
 import javax.swing.JLabel;
 import javax.swing.SwingConstants;
+import javax.swing.plaf.ComponentUI;
+
+import swingjs.plaf.JSLabelUI;
 
 public class Label extends JLabel {
 
@@ -17,10 +20,19 @@ public Label(String text) {
 	
 	public Label(String text, int center) {
 		super(text);
+		/**
+		 * @j2sNative
+		 * this.getUI$().isAWT = true;
+		 */
 		super.setBackground(null);
 		setAlignment(center);
 	}
 
+	@Override
+	public void setText(String text) {
+	  super.setText(text);
+	}
+	
 	@Override
 	public void setBackground(Color c) {
 		super.setBackground(c);
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
@@ -411,6 +411,12 @@ public void setDraggable(JSFunction f) {
 	 */
 	protected int num;
 
+	/**
+	 * a flag to indicate that this is an AWT component
+	 * 
+	 */
+	public boolean isAWT;
+
 	// /**
 	// * a flag to indicate that it is not visible, but not according to Java
 	// */
@@ -1450,9 +1456,12 @@ private Dimension getIconSize(AbstractButton b) {
 	}
 	
 	private Dimension getTextSize(AbstractButton b) {
-		String t;
-		return (textNode == null || (t = b.getText()) == null 
-				|| t == "" ? null : getHTMLSize(textNode));
+		if (textNode == null)
+			return null;
+		String t = b.getText();
+		if (isAWT && t == "")
+			t = "\u00A0"; // AWT labels do not hide if ""
+		return (t == null || t == "" ? null : getHTMLSize(textNode));
 	}
 
 	/**
@@ -2145,9 +2154,13 @@ protected void setIconAndText(String prop, Icon icon, int gap, String text) {
 				DOMNode.setStyles(iconNode, "height", iconHeight + "px", "width", icon.getIconWidth() + "px");
 			}
 		}
-		if (text == null || text.length() == 0) {
+		if (text == null) {
 			text = "";
-		} else {
+		} else if (text == "") {
+			if (isAWT)
+				text = "\u00A0"; // AWT labels do not hide if ""
+		}
+		if (text != "") {
 			if (text == "\0") {
 				isPaintedOnly = true; // this cannot be undone
 			}
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSGraphicsUtils.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSGraphicsUtils.java
@@ -272,6 +272,8 @@ public static Dimension getPreferredButtonSize(AbstractButton b, int textIconGap
         ui.setTainted();
         Icon icon = b.getIcon();
         String text = b.getText();
+        if (ui.isAWT && text == "")
+        	text = "\u00A0"; // nonbreaking space for java.awt.Label
 
         Font font = b.getFont();
         FontMetrics fm = b.getFontMetrics(font);
