allowing for full self-painting of (J)Label and (J)Button

hansonr · hansonr · commit 1d5902f6d520 · 2019-07-02T20:36:36.000+02: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
@@ -43,7 +43,6 @@
 import javax.swing.JMenuItem;
 import javax.swing.LookAndFeel;
 import javax.swing.UIManager;
-import javax.swing.border.CompoundBorder;
 import javax.swing.plaf.UIResource;
 
 import swingjs.api.js.DOMNode;
@@ -189,7 +188,9 @@ else if (button.getBorder() == BorderFactory.html5Border)
 		if (!isMenuSep) {
 			setMnemonic(-1);
 			setAlignments(button, false);
+			updateCenteringNode();
 		}
+		
 	}
 
 	/**
@@ -784,6 +785,8 @@ protected Dimension getHTMLSizePreferred(DOMNode obj, boolean addCSS) {
 	@Override
 	public void paint(Graphics g, JComponent c) {
 		imagePersists = true; // at least for now.
+		if (jc.秘paintsSelf())
+			DOMNode.setStyles(centeringNode, "visibility", "visible");
 		super.paint(g, 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
@@ -2403,13 +2403,14 @@ protected void addCentering(DOMNode node) {
 	}
 
 	protected void updateCenteringNode() {
-//		// old code -- label only -- is this advisable? 
-//		if (actualHeight > 0)
-//			DOMNode.setStyles(centeringNode, "position", "absolute", "height",
-//					actualHeight + "px");
-//		if (actualWidth > 0)
-//			DOMNode.setStyles(centeringNode, "position", "absolute", "width",
-//					actualWidth + "px");
+		boolean paintsSelf = jc.秘paintsSelf();
+		if (paintsSelf) {
+			// component will be responsible for border, background, and text
+			DOMNode.setStyles(centeringNode, "visibility", "hidden");
+			DOMNode.setStyles(domNode, "border", "none");
+			DOMNode.setStyles(domNode, "background", "none");
+		}
+
 	}
 
 	protected void setAlignments(AbstractButton b, boolean justGetPreferred) {
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
@@ -78,6 +78,8 @@ public Dimension getMaximumSize(JComponent jc) {
 
 	@Override
 	public void paint(Graphics g, JComponent c) {
+		if (jc.秘paintsSelf())
+			DOMNode.setStyles(centeringNode, "visibility", "visible");
 		super.paint(g, c);
 		// TODO: implement this for buttons?
 		DOMNode.setStyles(textNode, "overflow", "hidden", "white-space", "nowrap");
