vertical alignment simplification

hansonr · hansonr · commit d8b2ba76927c · 2019-07-12T14:32:13.000+01: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
@@ -2574,6 +2574,8 @@ protected void setAlignments(AbstractButton b, boolean justGetPreferred) {
 		
 		DOMNode.setStyles(centeringNode, "position", "absolute", "top", null, "left", null, "transform", null, "width", wCtr + "px", "height", hCtr + "px");
 
+		// horizontal
+		
 		isFullyCentered = false;
 		if (alignHCenter && alignVCenter && wIcon == 0 || wText == 0 && margins.left == margins.right
 				&& margins.top == margins.bottom && insets.left == insets.right && insets.top == insets.bottom)
@@ -2646,10 +2648,12 @@ protected void setAlignments(AbstractButton b, boolean justGetPreferred) {
 				}
 			}
 
+			// vertical
+			
 			h = c.getHeight();
 
 			if (h == 0) {
-				h = 16;
+				h = 16; // fallback -- actually, this is a real problem.
 			}
 
 			if (menuAnchorNode == null) {
@@ -2698,7 +2702,7 @@ protected void setAlignments(AbstractButton b, boolean justGetPreferred) {
 						"translateY(-" + itop + "%)" + (iscale == null ? "" : iscale));
 			} else {
 				DOMNode.setStyles(menuAnchorNode, "height", h + "px");
-				addCSS(cssTxt, "top", "50%", "transform", "translateY(-50%)");
+				//addCSS(cssTxt, "top", "50%", "transform", "translateY(-50%)");
 				addCSS(cssIcon, "top", "50%", "transform", "translateY(-65%) scale(0.6,0.6)");
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -2574,6 +2574,8 @@ protected void setAlignments(AbstractButton b, boolean justGetPreferred) {`
`2574`	`2574`
`2575`	`2575`	`DOMNode.setStyles(centeringNode, "position", "absolute", "top", null, "left", null, "transform", null, "width", wCtr + "px", "height", hCtr + "px");`
`2576`	`2576`
	`2577`	`+ // horizontal`
	`2578`	`+`
`2577`	`2579`	`isFullyCentered = false;`
`2578`	`2580`	`if (alignHCenter && alignVCenter && wIcon == 0 \|\| wText == 0 && margins.left == margins.right`
`2579`	`2581`	`&& margins.top == margins.bottom && insets.left == insets.right && insets.top == insets.bottom)`
`@@ -2646,10 +2648,12 @@ protected void setAlignments(AbstractButton b, boolean justGetPreferred) {`
`2646`	`2648`	`}`
`2647`	`2649`	`}`
`2648`	`2650`
	`2651`	`+ // vertical`
	`2652`	`+`
`2649`	`2653`	`h = c.getHeight();`
`2650`	`2654`
`2651`	`2655`	`if (h == 0) {`
`2652`		`- h = 16;`
	`2656`	`+ h = 16; // fallback -- actually, this is a real problem.`
`2653`	`2657`	`}`
`2654`	`2658`
`2655`	`2659`	`if (menuAnchorNode == null) {`
`@@ -2698,7 +2702,7 @@ protected void setAlignments(AbstractButton b, boolean justGetPreferred) {`
`2698`	`2702`	`"translateY(-" + itop + "%)" + (iscale == null ? "" : iscale));`
`2699`	`2703`	`} else {`
`2700`	`2704`	`DOMNode.setStyles(menuAnchorNode, "height", h + "px");`
`2701`		`- addCSS(cssTxt, "top", "50%", "transform", "translateY(-50%)");`
	`2705`	`+ //addCSS(cssTxt, "top", "50%", "transform", "translateY(-50%)");`
`2702`	`2706`	`addCSS(cssIcon, "top", "50%", "transform", "translateY(-65%) scale(0.6,0.6)");`
`2703`	`2707`	`}`
`2704`	`2708`