From c03d445a8ccfced5a59da680c37587f1024f3eca Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Tue, 9 Dec 2025 00:34:58 +0000
Subject: [PATCH] 6223700: XP L&F: Non-TopLevel JMenu's painting error

Reviewed-by: kizune, dnguyen
---
 .../swing/plaf/windows/WindowsMenuUI.java     |  2 +-
 .../swing/JMenu/TestPaintSpillOverBug.java    | 82 +++++++++++++++++++
 2 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 test/jdk/javax/swing/JMenu/TestPaintSpillOverBug.java

diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuUI.java
index 130b09227cc..a7aca0c5ccf 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuUI.java
@@ -301,7 +301,7 @@ public final class WindowsMenuUI extends BasicMenuUI {
 
             JMenu menu = (JMenu)evt.getSource();
             ButtonModel model = menu.getModel();
-            if (menu.isRolloverEnabled()) {
+            if (menu.isRolloverEnabled() && menu.isTopLevelMenu()) {
                 model.setRollover(false);
                 menuItem.repaint();
             }
diff --git a/test/jdk/javax/swing/JMenu/TestPaintSpillOverBug.java b/test/jdk/javax/swing/JMenu/TestPaintSpillOverBug.java
new file mode 100644
index 00000000000..8452b93cf45
--- /dev/null
+++ b/test/jdk/javax/swing/JMenu/TestPaintSpillOverBug.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2025, 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 6223700
+ * @requires (os.family == "windows")
+ * @summary Verifies no painting spillover in Win L&F
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual TestPaintSpillOverBug
+ */
+
+import javax.swing.JFrame;
+import javax.swing.JMenuBar;
+import javax.swing.JMenu;
+import javax.swing.UIManager;
+
+public class TestPaintSpillOverBug {
+
+    static final String INSTRUCTIONS = """
+        A JMenu "click Me" will be shown. Click on it.
+        Position the mouse in the "Slowly Move Mouse Out of This" JMenu
+        so that the popup menu appears to the right.
+        Slowly move the mouse towards the edge of the item,
+        one pixel at a time
+        When the mouse hits the edge,
+         if the selection background spill over on to the popup
+        press Fail else press Pass.""";
+
+    public static void main(String[] args) throws Exception {
+        UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
+
+        PassFailJFrame.builder()
+                .title("TestPaintSpillOverBug Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(60)
+                .testUI(TestPaintSpillOverBug::createUI)
+                .position(PassFailJFrame.Position.TOP_LEFT_CORNER)
+                .build()
+                .awaitAndCheck();
+
+    }
+
+    static JFrame createUI() {
+        JFrame f = new JFrame("TestPaintSpillOverBug");
+        JMenuBar bar = new JMenuBar();
+        JMenu clickMe = new JMenu("Click Me");
+        JMenu culprit = new JMenu("Slowly Move Mouse Out of This");
+        culprit.add("This item gets partially obscured");
+        culprit.add(" ");
+        clickMe.add(" ");
+        clickMe.addSeparator();
+        clickMe.add(culprit);
+        clickMe.addSeparator();
+        clickMe.add(" ");
+        bar.add(clickMe);
+        f.setJMenuBar(bar);
+        f.setSize(600, 200);
+        return f;
+    }
+}