JMenu fixes for JSmol modelkit menu with no text

BobHanson · BobHanson · commit 3c1d52d77595 · 2023-01-09T22:47:55.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
@@ -1457,8 +1457,16 @@ protected void updateIcon() {
 			// it has a getIcon() method. JavaScript will not care if
 			// it is really a JLabel or JOptionPane, which also have icons
 			ImageIcon icon = getOrCreateIcon(c, null);
-			if (icon == null ? currentIcon != null : !icon.equals(currentIcon))
-				setIconAndText("icon", icon, currentGap, currentText);
+			if (icon == currentIcon && icon != null) {
+				BufferedImage bi = (BufferedImage) currentIcon.getImage();
+				if (bi.秘getImageNode(BufferedImage.GET_IMAGE_ALLOW_NULL) == imageNode) {
+					return;
+				}
+			}
+			if (menuAnchorNode != null) {
+				DOMNode.setStyle(menuAnchorNode, "min-width", "20px");
+			}
+			setIconAndText("icon", icon, currentGap, currentText);
 		}
 	}
 
@@ -2563,6 +2571,7 @@ protected void setIconAndText(String prop, Icon icon, int gap, String text) {
 						h = 20;
 					}
 					DOMNode.setStyles(iconNode, "height", h + "px", "width", w  + "px");
+					DOMNode.setStyles(imageNode, "height", h + "px", "width", w  + "px");
 					if (!imagePersists)
 						DOMNode.setStyle(imageNode, "visibility", "hidden");
 				}
@@ -2878,7 +2887,7 @@ protected void setAlignments(AbstractButton b, boolean justGetPreferred) {
 		isFullyCentered = (alignHCenter && alignVCenter && wIcon == 0 || wText == 0
 				&& (actionNode == null || this.cellComponent != null || isSimpleButton) && margins.left == margins.right
 				&& margins.top == margins.bottom && myInsets.left == myInsets.right && myInsets.top == myInsets.bottom);
-		if (isFullyCentered) {
+		if (isFullyCentered && !isMenuItem) {
 			// simple totally centered label or button
 			// can't have width or height here --- let the browser figure that out
 			fullyCenter(cssCtr, isSimpleButton || isLabel);
@@ -3040,7 +3049,7 @@ protected void setAlignments(AbstractButton b, boolean justGetPreferred) {
 					addJSKeyVal(cssAction, "top", "65%", "transform", "translateY(-100%) scale(0.6)");
 					addJSKeyVal(cssIcon, "top", "50%", "transform", "translateY(-80%)");
 				} else {
-					addJSKeyVal(cssIcon, "top", "50%", "transform", "translateY(-80%) scale(0.6)");
+					addJSKeyVal(cssIcon, "top", "50%", "transform", "translateY(-80%)");
 				}
 			}
 
@@ -3084,7 +3093,7 @@ private void setMenuAnchorAndAccelerator(AbstractButton b, int wCtr, boolean ltr
 						"margin", "0px 5px", "transform", "translateY(15%)");
 			}
 		}
-		if (!isMenu || isMenuItem)
+		if (!isMenu || isMenuItem && currentText != null && currentText.length() > 0)
 			DOMNode.setStyle(menuAnchorNode, // "width", "90%",
 					"min-width", Math.max(75, (23 + 15 + wCtr + wAccel + margins.left + margins.right)) + "px"); // was
 	}
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSMenuUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSMenuUI.java
@@ -39,6 +39,7 @@ public DOMNode updateDOMNode() {
 			domNode = createItem(isMenuBarMenu ? "_bar" : "_elem", null);
 			bindJQueryEvents(domNode, "mouseenter mouseleave", SOME_MOUSE_EVENT);
 		}
+		imagePersists = true;
 		allowTextAlignment = isMenuItem = !isMenuBarMenu;
 		containerNode = (isMenuBarMenu ? null : domNode);
 		addClass(domNode, isMenuBarMenu ? "j2s-menuBar-menu" : "j2s-popup-menu");

Original file line number	Diff line number	Diff line change
`@@ -1457,8 +1457,16 @@ protected void updateIcon() {`
`1457`	`1457`	`// it has a getIcon() method. JavaScript will not care if`
`1458`	`1458`	`// it is really a JLabel or JOptionPane, which also have icons`
`1459`	`1459`	`ImageIcon icon = getOrCreateIcon(c, null);`
`1460`		`- if (icon == null ? currentIcon != null : !icon.equals(currentIcon))`
`1461`		`- setIconAndText("icon", icon, currentGap, currentText);`
	`1460`	`+ if (icon == currentIcon && icon != null) {`
	`1461`	`+ BufferedImage bi = (BufferedImage) currentIcon.getImage();`
	`1462`	`+ if (bi.秘getImageNode(BufferedImage.GET_IMAGE_ALLOW_NULL) == imageNode) {`
	`1463`	`+ return;`
	`1464`	`+ }`
	`1465`	`+ }`
	`1466`	`+ if (menuAnchorNode != null) {`
	`1467`	`+ DOMNode.setStyle(menuAnchorNode, "min-width", "20px");`
	`1468`	`+ }`
	`1469`	`+ setIconAndText("icon", icon, currentGap, currentText);`
`1462`	`1470`	`}`
`1463`	`1471`	`}`
`1464`	`1472`
`@@ -2563,6 +2571,7 @@ protected void setIconAndText(String prop, Icon icon, int gap, String text) {`
`2563`	`2571`	`h = 20;`
`2564`	`2572`	`}`
`2565`	`2573`	`DOMNode.setStyles(iconNode, "height", h + "px", "width", w + "px");`
	`2574`	`+ DOMNode.setStyles(imageNode, "height", h + "px", "width", w + "px");`
`2566`	`2575`	`if (!imagePersists)`
`2567`	`2576`	`DOMNode.setStyle(imageNode, "visibility", "hidden");`
`2568`	`2577`	`}`
`@@ -2878,7 +2887,7 @@ protected void setAlignments(AbstractButton b, boolean justGetPreferred) {`
`2878`	`2887`	`isFullyCentered = (alignHCenter && alignVCenter && wIcon == 0 \|\| wText == 0`
`2879`	`2888`	`&& (actionNode == null \|\| this.cellComponent != null \|\| isSimpleButton) && margins.left == margins.right`
`2880`	`2889`	`&& margins.top == margins.bottom && myInsets.left == myInsets.right && myInsets.top == myInsets.bottom);`
`2881`		`- if (isFullyCentered) {`
	`2890`	`+ if (isFullyCentered && !isMenuItem) {`
`2882`	`2891`	`// simple totally centered label or button`
`2883`	`2892`	`// can't have width or height here --- let the browser figure that out`
`2884`	`2893`	`fullyCenter(cssCtr, isSimpleButton \|\| isLabel);`
`@@ -3040,7 +3049,7 @@ protected void setAlignments(AbstractButton b, boolean justGetPreferred) {`
`3040`	`3049`	`addJSKeyVal(cssAction, "top", "65%", "transform", "translateY(-100%) scale(0.6)");`
`3041`	`3050`	`addJSKeyVal(cssIcon, "top", "50%", "transform", "translateY(-80%)");`
`3042`	`3051`	`} else {`
`3043`		`- addJSKeyVal(cssIcon, "top", "50%", "transform", "translateY(-80%) scale(0.6)");`
	`3052`	`+ addJSKeyVal(cssIcon, "top", "50%", "transform", "translateY(-80%)");`
`3044`	`3053`	`}`
`3045`	`3054`	`}`
`3046`	`3055`
`@@ -3084,7 +3093,7 @@ private void setMenuAnchorAndAccelerator(AbstractButton b, int wCtr, boolean ltr`
`3084`	`3093`	`"margin", "0px 5px", "transform", "translateY(15%)");`
`3085`	`3094`	`}`
`3086`	`3095`	`}`
`3087`		`- if (!isMenu \|\| isMenuItem)`
	`3096`	`+ if (!isMenu \|\| isMenuItem && currentText != null && currentText.length() > 0)`
`3088`	`3097`	`DOMNode.setStyle(menuAnchorNode, // "width", "90%",`
`3089`	`3098`	`"min-width", Math.max(75, (23 + 15 + wCtr + wAccel + margins.left + margins.right)) + "px"); // was`
`3090`	`3099`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ public DOMNode updateDOMNode() {`
`39`	`39`	`domNode = createItem(isMenuBarMenu ? "_bar" : "_elem", null);`
`40`	`40`	`bindJQueryEvents(domNode, "mouseenter mouseleave", SOME_MOUSE_EVENT);`
`41`	`41`	`}`
	`42`	`+ imagePersists = true;`
`42`	`43`	`allowTextAlignment = isMenuItem = !isMenuBarMenu;`
`43`	`44`	`containerNode = (isMenuBarMenu ? null : domNode);`
`44`	`45`	`addClass(domNode, isMenuBarMenu ? "j2s-menuBar-menu" : "j2s-popup-menu");`