Focus fix for JSPopupMenuUI collapseAll

BobHanson · BobHanson · commit 39fb5136b5af · 2020-04-08T08:58:43.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JPopupMenu.java b/sources/net.sf.j2s.java.core/src/javax/swing/JPopupMenu.java
@@ -680,6 +680,11 @@ public void pack() {
         }
     }
 
+    
+    public void hide() {
+    	System.out.println("JPopupMenu hide");
+    	super.hide();
+    }
 	/**
 	 * Sets the visibility of the popup menu.
 	 *
@@ -696,8 +701,14 @@ public void setVisible(boolean b) {
 			return;
 		}
 		getUI().setVisible(b);
-		if (!b)
+		if (!b) {
 			popup = null;
+			
+			System.out.println("JPopupMenu.setVis false to invoker " + invoker);
+			// SwingJS added
+			if (invoker != null && invoker.isFocusable())
+				invoker.requestFocus();
+		}
 //		/**
 //		 * @j2sNative
 //		 * 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSToolkit.java b/sources/net.sf.j2s.java.core/src/swingjs/JSToolkit.java
@@ -651,22 +651,6 @@ public static boolean hasFocus(Component c) {
 		return (ui != null && !ui.isNull && ui.hasFocus());
 	}
 
-	public static boolean requestFocus(Component c) {
-		final JSComponentUI ui = getUI(c, false);
-		if (ui == null || ui.isNull || !ui.jc.isFocusable())
-			return false;
-		Runnable r = new Runnable() {
-
-			@Override
-			public void run() {
-				ui.requestFocus(null, false, false, 0, null);
-			}
-			
-		};
-		dispatch(r, 50, 0);
-		return true;
-	}
-
 	private static JSAudio audioPlayer;
 
 	private static JSAudio getAudioPlayer() {
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
@@ -947,6 +947,10 @@ private void setTabIndex(int i) {
 		}
 	}
 
+	/**
+	 * Called by DefaultFocusTraversalPolicy only.
+	 * Overridden to return true in buttons, menu items, JEditorPane, JTextPane, JTextArea
+	 */
 	@Override
 	public boolean isFocusable() {
 		// meaning "can use TAB to set their focus" within a focus cycle
@@ -970,7 +974,7 @@ public boolean isFocusable() {
 //		return (jc.isFocusable() && setFocusable());
 	}
 
-	protected boolean setFocusable() {
+	public boolean setFocusable() {
 		if (focusNode == null) 
 		  addFocusHandler();
 		if (focusNode != null)
@@ -984,16 +988,14 @@ public boolean hasFocus() {
 				 */false;
 	}
 
-	@Override
-	public boolean requestFocus(Component lightweightChild, boolean temporary, boolean focusedWindowChangeAllowed,
-			long time, Cause cause) {
-		if (lightweightChild == null)
-			return focus();
-		if (!jc.isFocusable())
-			return false;
-		setFocusable();
-		return JSToolkit.requestFocus(lightweightChild);
-	}
+	private Runnable focusRunnable = new Runnable() {
+
+		@Override
+		public void run() {
+			focus();
+		}
+		
+	};
 
 	/**
 	 * Outgoing: Initiate a focus() event in the system directly
@@ -1017,6 +1019,29 @@ protected void setComponentFocus() {
 			c.requestFocus();
 	}
 
+	/**
+	 * A Window ComponentPeer method called from Component.requestFocusHelper
+	 * in response to a requestFocus() call.
+	 * 
+	 * @param me  The lightweight component to receive the focus.
+	 * @param temporary ignored
+	 * @param focusedWindowChangeAllowed ignored
+	 * @param time ignored
+	 * @param cause ignored
+	 * @return true if successful
+	 */
+	@Override
+	public boolean requestFocus(Component me, boolean temporary, boolean focusedWindowChangeAllowed, long time,
+			Cause cause) {
+		if (me == null)
+			return focus();
+		if (!me.isFocusable())
+			return false;
+		JSComponentUI ui = ((JSComponent) me).秘getUI();
+		ui.setFocusable();
+		JSToolkit.dispatch(ui.focusRunnable, 50, 0);
+		return true;
+	}
 	/**
 	 * Add the $().focus() and $().blur() events to a DOM button.
 	 * 
@@ -3500,10 +3525,12 @@ protected void setBackgroundDOM(DOMNode node, Color color) {
 	public void clearPaintPath() {
 		JSComponent c = jc;
 		while (c != null) {
-			((JSComponentUI) c.ui).inPaintPath = true;
-
+			JSComponentUI ui = c.秘getUI();
+			if (ui == null)
+				return;
+			ui.inPaintPath = true;
 			c.秘setPaintsSelf(JSComponent.PAINTS_SELF_ALWAYS);
-			((JSComponentUI) c.ui).setTransparent();
+			ui.setTransparent();
 			c = c.getParent();
 		}
 	}
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSPopupMenuUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSPopupMenuUI.java
@@ -92,6 +92,8 @@ public void propertyChange(PropertyChangeEvent e) {
 	
 	private static JSSwingMenu j2sSwingMenu;
 
+	private static Component lastInvoker;
+
 	private JPopupMenu popupMenu;
 //	private PopupMenuListener popupMenuListener;
 
@@ -200,6 +202,7 @@ public void setVisible(boolean b) {
 					updateMenu(true);
 				}
 			}
+			lastInvoker = menu.getInvoker();
 			// issue here?? jc.addNotify();
 			//have to cheat here; these values are private to JMenu.
 			int x = /** @j2sNative this.menu.desiredLocationX || */0;
@@ -1193,8 +1196,13 @@ public static void processJ2SMenuCmd(Object[] data) {
 		case "collapseAll":
 			hideMenusAndToolTip();
 			isMenuOpen = false;
-			j2smenu.options.jPopupMenu.visible = false;
-			((JComponent) j2smenu.options.jPopupMenu.getInvoker()).getRootPane().requestFocus();
+			c = j2smenu.options.jPopupMenu;
+			c.visible = false;
+			JSPopupMenuUI ui = (JSPopupMenuUI) c.getUI();
+			JComponent invoker = ((JComponent)((JPopupMenu)c).getInvoker());
+			if (invoker instanceof JMenu)
+				invoker = invoker.getRootPane();
+			invoker.requestFocus();
 			break;
 		case "setFocus":
 			isMenuOpen = true;
@@ -1243,6 +1251,10 @@ public boolean isPopupTrigger(MouseEvent e) {
     
 	public static void closeAllMenus() {
 		// top-level or submenu:
+		if (lastInvoker != null) {
+			lastInvoker.requestFocus();
+			lastInvoker = null;
+		}
 		JSUtil.jQuery.$(".ui-j2smenu").hide();
 		JSUtil.jQuery.$(".ui-j2smenu-node").removeClass("ui-state-active").removeClass("ui-state-focus");
 	}
