reverting to give buttons same offset as labels. It's a no-win game

hansonr · hansonr · commit 4126f6a864ac · 2019-06-13T23:09:32.000+02: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
@@ -1116,7 +1116,7 @@ protected void revalidate() {
 	 * 
 	 */
 	public void setTainted() {
-		isTainted = true;
+		setTainted(true);
 	}
 
 	/**
@@ -1775,7 +1775,8 @@ public void update(Graphics g, JComponent c) {
 			System.out.println("drawing " + c.getWidth() + " " + c.getHeight());
 		}
 		setHTMLElement();
-		setAlignment();
+		if (allowTextAlignment && centeringNode != null)
+			setAlignments((AbstractButton)jc, false);
 		paint(g, c);
 	}
 
@@ -2342,11 +2343,6 @@ public void setButtonRectangles(boolean isPreferred) {
 		iconR.x = iconR.y = textR.x = textR.y = 0;
 	}
 	
-	protected void setAlignment() {
-		if (allowTextAlignment && centeringNode != null)
-			setAlignments((AbstractButton)jc, false);
-	}
-
 	protected void addCentering(DOMNode node) {
 		if (iconNode == null)
 			iconNode = newDOMObject("span", id + "_icon");
@@ -2634,11 +2630,11 @@ protected void setAlignments(AbstractButton b, boolean justGetPreferred) {
 	}
 
 	protected void fullyCenter(DOMNode node, boolean isCtr) {
-		if (isLabel)
+//		if (isLabel)
 			DOMNode.setStyles(node, "width", null, "top", "50%", "left", "50%", "transform",
 				"translateX(-50%)translateY(-50%)translateY(0.5px)translateX(0.5px)", "position", "absolute");
-		else
-			DOMNode.setStyles(node, "width", null, "top", null, "left", null, "transform", null, "position", null, "height", null);
+// no, this causes the label to be offset too much
+	//		DOMNode.setStyles(node, "width", null, "top", null, "left", null, "transform", null, "position", null, "height", null);
 	}
 
 

Original file line number	Diff line number	Diff line change
`@@ -1116,7 +1116,7 @@ protected void revalidate() {`
`1116`	`1116`	`*`
`1117`	`1117`	`*/`
`1118`	`1118`	`public void setTainted() {`
`1119`		`- isTainted = true;`
	`1119`	`+ setTainted(true);`
`1120`	`1120`	`}`
`1121`	`1121`
`1122`	`1122`	`/**`
`@@ -1775,7 +1775,8 @@ public void update(Graphics g, JComponent c) {`
`1775`	`1775`	`System.out.println("drawing " + c.getWidth() + " " + c.getHeight());`
`1776`	`1776`	`}`
`1777`	`1777`	`setHTMLElement();`
`1778`		`- setAlignment();`
	`1778`	`+ if (allowTextAlignment && centeringNode != null)`
	`1779`	`+ setAlignments((AbstractButton)jc, false);`
`1779`	`1780`	`paint(g, c);`
`1780`	`1781`	`}`
`1781`	`1782`
`@@ -2342,11 +2343,6 @@ public void setButtonRectangles(boolean isPreferred) {`
`2342`	`2343`	`iconR.x = iconR.y = textR.x = textR.y = 0;`
`2343`	`2344`	`}`
`2344`	`2345`
`2345`		`- protected void setAlignment() {`
`2346`		`- if (allowTextAlignment && centeringNode != null)`
`2347`		`- setAlignments((AbstractButton)jc, false);`
`2348`		`- }`
`2349`		`-`
`2350`	`2346`	`protected void addCentering(DOMNode node) {`
`2351`	`2347`	`if (iconNode == null)`
`2352`	`2348`	`iconNode = newDOMObject("span", id + "_icon");`
`@@ -2634,11 +2630,11 @@ protected void setAlignments(AbstractButton b, boolean justGetPreferred) {`
`2634`	`2630`	`}`
`2635`	`2631`
`2636`	`2632`	`protected void fullyCenter(DOMNode node, boolean isCtr) {`
`2637`		`- if (isLabel)`
	`2633`	`+// if (isLabel)`
`2638`	`2634`	`DOMNode.setStyles(node, "width", null, "top", "50%", "left", "50%", "transform",`
`2639`	`2635`	`"translateX(-50%)translateY(-50%)translateY(0.5px)translateX(0.5px)", "position", "absolute");`
`2640`		`- else`
`2641`		`- DOMNode.setStyles(node, "width", null, "top", null, "left", null, "transform", null, "position", null, "height", null);`
	`2636`	`+// no, this causes the label to be offset too much`
	`2637`	`+ // DOMNode.setStyles(node, "width", null, "top", null, "left", null, "transform", null, "position", null, "height", null);`
`2642`	`2638`	`}`
`2643`	`2639`
`2644`	`2640`