8326458: Menu mnemonics don't toggle in Windows LAF when F10 is pressed

Reviewed-by: psadhukhan, aivanov

Author: Abhishek Kumar

src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -139,19 +139,22 @@ protected void installKeyboardActions() {
      */
     @SuppressWarnings("serial") // Superclass is not serializable across versions
     private static class TakeFocus extends AbstractAction {
+        @Override
         public void actionPerformed(ActionEvent e) {
             JMenuBar menuBar = (JMenuBar)e.getSource();
             JMenu menu = menuBar.getMenu(0);
             if (menu != null) {
                 MenuSelectionManager msm =
                     MenuSelectionManager.defaultManager();
-                MenuElement[] path = new MenuElement[2];
-                path[0] = (MenuElement)menuBar;
-                path[1] = (MenuElement)menu;
-                msm.setSelectedPath(path);
-
-                // show mnemonics
-                WindowsLookAndFeel.setMnemonicHidden(false);
+                MenuElement[] selectedPath = msm.getSelectedPath();
+                if (selectedPath.length > 0 && (selectedPath[0] instanceof JMenuBar)) {
+                    msm.clearSelectedPath();
+                    WindowsLookAndFeel.setMnemonicHidden(true);
+                } else {
+                    MenuElement[] path = {menuBar, menu};
+                    msm.setSelectedPath(path);
+                    WindowsLookAndFeel.setMnemonicHidden(false);
+                }
                 WindowsLookAndFeel.repaintRootPane(menuBar);
             }
         }

test/jdk/javax/swing/JMenuBar/TestMenuMnemonic.java

@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8326458
+ * @key headful
+ * @requires (os.family == "windows")
+ * @modules java.desktop/com.sun.java.swing.plaf.windows
+ * @summary Verifies if menu mnemonics toggle on F10 press in Windows LAF
+ * @run main TestMenuMnemonic
+ */
+
+import java.awt.Robot;
+import java.awt.event.KeyEvent;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.MenuElement;
+import javax.swing.MenuSelectionManager;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+
+import com.sun.java.swing.plaf.windows.WindowsLookAndFeel;
+
+public class TestMenuMnemonic {
+
+    private static JFrame frame;
+    private static JMenuBar menuBar;
+    private static JMenu fileMenu;
+
+    private static final AtomicInteger mnemonicHideCount = new AtomicInteger(0);
+    private static final AtomicInteger mnemonicShowCount = new AtomicInteger(0);
+
+    private static final int EXPECTED = 5;
+
+    public static void main(String[] args) throws Exception {
+        UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
+        Robot robot = new Robot();
+        robot.setAutoDelay(100);
+
+        try {
+            SwingUtilities.invokeAndWait(TestMenuMnemonic::createAndShowUI);
+            robot.waitForIdle();
+            robot.delay(1000);
+
+            for (int i = 0; i < EXPECTED * 2; i++) {
+                robot.keyPress(KeyEvent.VK_F10);
+                robot.waitForIdle();
+                robot.delay(50);
+                robot.keyRelease(KeyEvent.VK_F10);
+                robot.waitForIdle();
+                robot.delay(50);
+                SwingUtilities.invokeAndWait(TestMenuMnemonic::verifyMnemonicsState);
+            }
+
+            if (mnemonicShowCount.get() != EXPECTED
+                && mnemonicHideCount.get() != EXPECTED) {
+                throw new RuntimeException("Mismatch in Mnemonic show/hide on F10 press");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+
+    private static void verifyMnemonicsState() {
+        MenuSelectionManager msm =
+                MenuSelectionManager.defaultManager();
+        MenuElement[] selectedPath = msm.getSelectedPath();
+        if (WindowsLookAndFeel.isMnemonicHidden()) {
+            mnemonicHideCount.getAndIncrement();
+            // Check if selection is cleared when mnemonics are hidden
+            if (selectedPath.length != 0) {
+                throw new RuntimeException("Menubar is active after" +
+                        " mnemonics are hidden");
+            }
+        } else {
+            mnemonicShowCount.getAndIncrement();
+            if (selectedPath.length != 2
+                && (selectedPath[0] != menuBar || selectedPath[1] != fileMenu)) {
+                throw new RuntimeException("No Menu and Menubar is active when" +
+                        " mnemonics are shown");
+            }
+        }
+    }
+
+    private static void createAndShowUI() {
+        frame = new JFrame("Test Menu Mnemonic Show/Hide");
+        menuBar  = new JMenuBar();
+        fileMenu = new JMenu("File");
+        JMenu editMenu = new JMenu("Edit");
+        fileMenu.setMnemonic(KeyEvent.VK_F);
+        editMenu.setMnemonic(KeyEvent.VK_E);
+        JMenuItem item1 = new JMenuItem("Item 1");
+        JMenuItem item2 = new JMenuItem("Item 2");
+        fileMenu.add(item1);
+        fileMenu.add(item2);
+        menuBar.add(fileMenu);
+        menuBar.add(editMenu);
+        frame.setJMenuBar(menuBar);
+        frame.setSize(250, 200);
+        frame.setLocationRelativeTo(null);
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        frame.setVisible(true);
+    }
+}