trying simple fullyCentered option for cssCtr in simple labels

BobHanson · BobHanson · commit 96c7ee6ced9c · 2019-11-13T22:05:45.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
@@ -1687,11 +1687,8 @@ protected Dimension setHTMLSize1(DOMNode node, boolean addCSS, boolean usePrefer
 			// setting here
 
 			if (!isMenuItem) {
-				@SuppressWarnings("unused")
 				boolean simpleButton = isSimpleButton;
-				@SuppressWarnings("unused")
 				DOMNode centerNode = centeringNode;
-				@SuppressWarnings("unused")
 				DOMNode dnode = domNode;
 				/**
 				 * @j2sNative
@@ -2661,9 +2658,9 @@ protected void setAlignments(AbstractButton b, boolean justGetPreferred) {
 		if (isFullyCentered) {
 			// simple totally centered label or button
 			// can't have width or height here --- let the browser figure that out
-			fullyCenter(cssCtr);
-			fullyCenter(cssIcon);
-			fullyCenter(cssTxt);
+			fullyCenter(cssCtr, isSimpleButton || isLabel);
+			fullyCenter(cssIcon, isSimpleButton);
+			fullyCenter(cssTxt, isSimpleButton);
 		} else {
 
 			// horizontal
@@ -2795,8 +2792,8 @@ protected void setAlignments(AbstractButton b, boolean justGetPreferred) {
 			updateCellNode();
 	}
 
-	private void fullyCenter(Object css) {
-		if (isSimpleButton)
+	private void fullyCenter(Object css, boolean noOffsets) {
+		if (noOffsets)
 			addJSKeyVal(css, "width", null, "position", null, "padding", "0", "margin", "0 auto");
 		else
 			addJSKeyVal(css, "width", null, "top", "50%", "left", "50%", "transform",
diff --git a/sources/net.sf.j2s.java.core/src/test/TApp2_Swing.java b/sources/net.sf.j2s.java.core/src/test/TApp2_Swing.java
@@ -82,6 +82,7 @@ private void setLBBounds(Component b, Component l, int i, int j) {
 		b.setFont(new Font(Font.SANS_SERIF, Font.PLAIN, 10 + i * 3));
 		l.setFont(new Font(Font.SANS_SERIF, Font.PLAIN, 10 + i * 3));
 		l.setBackground(Color.cyan);
+		((JComponent) l).setOpaque(true);
 		add(b);
 		add(l);
 	}

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,7 @@ private void setLBBounds(Component b, Component l, int i, int j) {`
`82`	`82`	`b.setFont(new Font(Font.SANS_SERIF, Font.PLAIN, 10 + i * 3));`
`83`	`83`	`l.setFont(new Font(Font.SANS_SERIF, Font.PLAIN, 10 + i * 3));`
`84`	`84`	`l.setBackground(Color.cyan);`
	`85`	`+ ((JComponent) l).setOpaque(true);`
`85`	`86`	`add(b);`
`86`	`87`	`add(l);`
`87`	`88`	`}`