HTML JLabels should inherit width and should wrap

BobHanson · BobHanson · commit dbc836684909 · 2019-11-26T23:19:57.000-06:00
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
@@ -590,7 +590,7 @@ public void setDraggable(JSFunction f) {
 	/**
 	 * processed text (local to setIconAndText) is HTML
 	 */
-	private boolean isHTML;
+	protected boolean isHTML;
 
 	/**
 	 * set false for tool tip or other non-label object that has text
@@ -1754,7 +1754,8 @@ protected Dimension setHTMLSize1(DOMNode node, boolean addCSS, boolean usePrefer
 		dim.height += h;
 		DOMNode.setStyles(node, "position", null);
 		if (w0 != null) {
-			DOMNode.setStyles(node, "width", w0, "height", h0);
+			DOMNode.setStyles(node, "width", 
+					 (isHTML && isLabel ? "inherit" : w0), "height", h0);
 		}
 		if (position != null) {
 			DOMNode.setStyles(node, "position", position);
@@ -2382,7 +2383,8 @@ protected void setIconAndText(String prop, Icon icon, int gap, String text) {
 			if (text == "\0") {
 				isPaintedOnly = true; // this cannot be undone
 			}
-			DOMNode.setStyles(textNode, "white-space", "nowrap");
+			if (!isHTML || !isLabel)
+				DOMNode.setStyles(textNode, "white-space", "nowrap");
 			if (icon == null) {
 				// tool tip does not allow text alignment
 				if (iconNode != null && allowTextAlignment 
@@ -2648,11 +2650,10 @@ protected void setAlignments(AbstractButton b, boolean justGetPreferred) {
 		Object cssTxt = getJSObject();
 		Object cssIcon = getJSObject();
 
-		addJSKeyVal(cssCtr, "position", "absolute", "top", null, "left", null, "transform", null, "width", wCtr + "px",
+		addJSKeyVal(cssCtr, "position", "absolute", "top", null, "left", null, "transform", null, "width", (isHTML && isLabel ? "inherit" : wCtr + "px"),
 				"height", hCtr + "px");
 		addJSKeyVal(cssIcon, "position", "absolute", "top", null, "left", null, "transform", null);
 		addJSKeyVal(cssTxt, "position", "absolute", "top", null, "left", null, "transform", null);
-
 		isFullyCentered = (alignHCenter && alignVCenter && wIcon == 0 || wText == 0 && margins.left == margins.right
 				&& margins.top == margins.bottom && myInsets.left == myInsets.right && myInsets.top == myInsets.bottom);
 		if (isFullyCentered) {
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
@@ -84,7 +84,10 @@ public void paint(Graphics g, JComponent c) {
 			DOMNode.setStyles(centeringNode, "visibility", "visible");
 		super.paint(g, c);
 		// TODO: implement this for buttons?
-		DOMNode.setStyles(textNode, "overflow", "hidden", "white-space", "nowrap");
+		if (isHTML)
+			DOMNode.setStyles(textNode, "overflow", null, "white-space", null);
+		else
+			DOMNode.setStyles(textNode, "overflow", "hidden", "white-space", "nowrap");
 		if (icon != null) {
 			// The graphics object is translated to the label,
 			// not the image, at this point. In order to get
@@ -110,6 +113,8 @@ public void paint(Graphics g, JComponent c) {
 	@Override
 	public Dimension getPreferredSize(JComponent jc) {
 		updateDOMNode();
+		if (isHTML)
+			return null;
 		return (isAWT ? getMinimumSizePeer(jc, label)
 				: label == null ? super.getPreferredSize(jc)
 						: JSGraphicsUtils.getPreferredButtonSize(((AbstractButton) jc),
