working more on button/label ui update

hansonr · hansonr · commit cd67c8704750 · 2018-12-17T15:14:33.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
@@ -967,15 +967,13 @@ protected void propertyChangedCUI(String prop) {
 			return;
 		}
 		if (prop == "text") {
-			if (centeringNode != null) {
 				String val = ((AbstractButton) c).getText();
 				if (val == null ? currentText != null : !val.equals(currentText))
 					setIconAndText(prop, currentIcon, currentGap, (String) val);
-			}
 			return;
 		}
 		if (prop == "iconTextGap") {
-			if (centeringNode != null) {
+			if (iconNode != null) {
 				int gap = ((AbstractButton) c).getIconTextGap();
 				if (currentGap != gap)
 					setIconAndText(prop, currentIcon, gap, currentText);
@@ -1984,7 +1982,7 @@ private ImageIcon getIcon(JSComponent c, Icon icon) {
 
 	protected void setIconAndText(String prop, Icon icon, int gap, String text) {
 
-		if (centeringNode == null)
+		if (iconNode == null && textNode == null)
 			return;
 		
 		// TODO so, actually, icons replace the checkbox or radio button, they do not
