probably unnecessary menuSelectionChanged trigger.

BobHanson · BobHanson · commit 75a8ae9a69c3 · 2020-05-16T01:56:05.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/ButtonListener.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/ButtonListener.java
@@ -273,11 +273,15 @@ public void mouseClicked(MouseEvent e) {
 	public void mousePressed(MouseEvent e) {
 		if (SwingUtilities.isLeftMouseButton(e)) {
 			AbstractButton b = (AbstractButton) e.getSource();
-			if (b.getUIClassID() == "MenuUI" && ((JMenu) b).isTopLevelMenu()) {
-				((JMenu) b).setPopupMenuVisible(!((JMenu) b).isPopupMenuVisible());
-				JComponent root = ((JComponent) b.getTopLevelAncestor()).getRootPane();
-				root.requestFocus();
-				//JSFocusPeer.focus(((JSComponentUI) root.getUI()).focusNode);
+			JSComponentUI ui = b.秘getUI();
+			if (ui.isMenu) {
+				JMenu jm = (JMenu) b;
+				if (jm.isTopLevelMenu()) {
+					jm.setPopupMenuVisible(!jm.isPopupMenuVisible());
+					JComponent root = ((JComponent) b.getTopLevelAncestor()).getRootPane();
+					root.requestFocus();
+				}
+				jm.menuSelectionChanged(true);		
 			}
 		}
 	}
@@ -290,6 +294,7 @@ public void mouseReleased(MouseEvent e) {
 				return;
 			b.doClick(0);
 			verifyButtonClick(b, true);
+			JSComponentUI ui = b.秘getUI();
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -273,11 +273,15 @@ public void mouseClicked(MouseEvent e) {`
`273`	`273`	`public void mousePressed(MouseEvent e) {`
`274`	`274`	`if (SwingUtilities.isLeftMouseButton(e)) {`
`275`	`275`	`AbstractButton b = (AbstractButton) e.getSource();`
`276`		`- if (b.getUIClassID() == "MenuUI" && ((JMenu) b).isTopLevelMenu()) {`
`277`		`- ((JMenu) b).setPopupMenuVisible(!((JMenu) b).isPopupMenuVisible());`
`278`		`- JComponent root = ((JComponent) b.getTopLevelAncestor()).getRootPane();`
`279`		`- root.requestFocus();`
`280`		`- //JSFocusPeer.focus(((JSComponentUI) root.getUI()).focusNode);`
	`276`	`+ JSComponentUI ui = b.秘getUI();`
	`277`	`+ if (ui.isMenu) {`
	`278`	`+ JMenu jm = (JMenu) b;`
	`279`	`+ if (jm.isTopLevelMenu()) {`
	`280`	`+ jm.setPopupMenuVisible(!jm.isPopupMenuVisible());`
	`281`	`+ JComponent root = ((JComponent) b.getTopLevelAncestor()).getRootPane();`
	`282`	`+ root.requestFocus();`
	`283`	`+ }`
	`284`	`+ jm.menuSelectionChanged(true);`
`281`	`285`	`}`
`282`	`286`	`}`
`283`	`287`	`}`
`@@ -290,6 +294,7 @@ public void mouseReleased(MouseEvent e) {`
`290`	`294`	`return;`
`291`	`295`	`b.doClick(0);`
`292`	`296`	`verifyButtonClick(b, true);`
	`297`	`+ JSComponentUI ui = b.秘getUI();`
`293`	`298`	`}`
`294`	`299`	`}`
`295`	`300`