JMenuItem reducing need for DOM styling

hansonr · hansonr · commit 86b9e85c8a80 · 2019-07-13T10:13:03.000+01:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/api/js/JSSwingMenu.java b/sources/net.sf.j2s.java.core/src/swingjs/api/js/JSSwingMenu.java
@@ -2,6 +2,11 @@
 
 import javax.swing.JPopupMenu;
 
+/**
+ * An abstract class to cover the JavaScript calls made to j2sMenu
+ * @author hansonr
+ *
+ */
 public abstract class JSSwingMenu {
 
 	public class Options {
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSMenuItemUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSMenuItemUI.java
@@ -36,6 +36,7 @@ public DOMNode updateDOMNode() {
 		return domNode;
 	}
 	
+	
 	@Override
 	public boolean handleJSEvent(Object target, int eventType, Object jQueryEvent) {
 		// we use == here because this will be JavaScript
@@ -59,19 +60,27 @@ public void installUI(JComponent jc) {
 		super.installUI(jc);
 	}	
 
+	
 	@Override
 	public void propertyChange(PropertyChangeEvent e) {
-		super.propertyChange(e);
 		String prop = e.getPropertyName();
-		if (jc.isVisible()) {
-			if (prop == "ancestor") {
-				if (jc.getParent() != null) {
- 					jc.getParent().秘getUI().setHTMLElement();
-				}
+		if (!jc.isVisible() && prop != "ancestor" && jc.getParent() == null)
+			return;
+		switch (prop) {
+		case "focusPainted":
+		case "focusable":
+		case "borderPainted":
+		case "opaque":
+			return;
+		}
+		super.propertyChange(e);
+		if (prop == "ancestor") {
+			if (jc.getParent() != null) {
+				jc.getParent().秘getUI().setHTMLElement();
 			}
 		}
 	}
-
+	
 	@Override
 	protected String getPropertyPrefix() {
 		return "MenuItem";
