7160604: Using non-opaque windows - popups are initially not painted correctly

Reviewed-by: serb, alexsch

7160604: Using non-opaque windows - popups are initially not painted correctly
Reviewed-by: serb, alexsch
613b96eb · bagiras · 35367e22 · 613b96eb · 613b96eb · 613b96eb
3 changed file
--- a/src/share/classes/javax/swing/JPopupMenu.java
+++ b/src/share/classes/javax/swing/JPopupMenu.java
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -736,7 +736,7 @@ public class JPopupMenu extends JComponent implements Accessible,MenuElement {

            if (pref == null || pref.width != getWidth() ||
                                pref.height != getHeight()) {
-                popup = getPopup();
+                showPopup();
            } else {
                validate();
            }
@@ -787,7 +787,7 @@ public class JPopupMenu extends JComponent implements Accessible,MenuElement {

        if(b) {
            firePopupMenuWillBecomeVisible();
-            popup = getPopup();
+            showPopup();
            firePropertyChange("visible", Boolean.FALSE, Boolean.TRUE);


@@ -805,7 +805,7 @@ public class JPopupMenu extends JComponent implements Accessible,MenuElement {
    }

    /**
-     * Returns a <code>Popup</code> instance from the
+     * Retrieves <code>Popup</code> instance from the
     * <code>PopupMenuUI</code> that has had <code>show</code> invoked on
     * it. If the current <code>popup</code> is non-null,
     * this will invoke <code>dispose</code> of it, and then
@@ -814,7 +814,7 @@ public class JPopupMenu extends JComponent implements Accessible,MenuElement {
     * This does NOT fire any events, it is up the caller to dispatch
     * the necessary events.
     */
-    private Popup getPopup() {
+    private void showPopup() {
        Popup oldPopup = popup;

        if (oldPopup != null) {
@@ -838,8 +838,8 @@ public class JPopupMenu extends JComponent implements Accessible,MenuElement {
                                          desiredLocationY);

        popupFactory.setPopupType(PopupFactory.LIGHT_WEIGHT_POPUP);
+        popup = newPopup;
        newPopup.show();
-        return newPopup;
    }

    /**
@@ -873,7 +873,7 @@ public class JPopupMenu extends JComponent implements Accessible,MenuElement {
        desiredLocationX = x;
        desiredLocationY = y;
        if(popup != null && (x != oldX || y != oldY)) {
-            popup = getPopup();
+            showPopup();
        }
    }

@@ -1030,7 +1030,7 @@ public class JPopupMenu extends JComponent implements Accessible,MenuElement {
            Dimension newSize = getPreferredSize();

            if (!oldSize.equals(newSize)) {
-                popup = getPopup();
+                showPopup();
            }
        }
    }

--- a/test/javax/swing/JPopupMenu/7160604/bug7160604.html
+++ b/test/javax/swing/JPopupMenu/7160604/bug7160604.html
+<!--
+ Copyright (c) 2013, 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.
+-->
+
+<html>
+<body>
+<applet  code="bug7160604.class" width=400 height=100></applet>
+Click on the top-bar and combo-box more than once. 
+Make sure popup menu and drop-down list have a border and their items are drawn properly.
+</body>
+</html>
--- a/test/javax/swing/JPopupMenu/7160604/bug7160604.java
+++ b/test/javax/swing/JPopupMenu/7160604/bug7160604.java
+/*
+ * Copyright (c) 2013, 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 7160604
+   @summary Using non-opaque windows - popups are initially not painted correctly
+   @author Oleg Pekhovskiy
+   @run applet/manual=yesno bug7160604.html
+*/
+
+import javax.swing.AbstractAction;
+import javax.swing.BorderFactory;
+import javax.swing.JApplet;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JWindow;
+import javax.swing.SwingUtilities;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+public class bug7160604 extends JApplet {
+
+    public void init() {
+        SwingUtilities.invokeLater(() -> {
+            final JWindow window = new JWindow();
+            window.setLocation(200, 200);
+            window.setSize(300, 300);
+
+            final JLabel label = new JLabel("...click to invoke JPopupMenu");
+            label.setOpaque(true);
+            final JPanel contentPane = new JPanel(new BorderLayout());
+            contentPane.setBorder(BorderFactory.createLineBorder(Color.RED));
+            window.setContentPane(contentPane);
+            contentPane.add(label, BorderLayout.NORTH);
+
+            final JComboBox comboBox = new JComboBox(new Object[]{"1", "2", "3", "4"});
+            contentPane.add(comboBox, BorderLayout.SOUTH);
+
+            final JPopupMenu jPopupMenu = new JPopupMenu();
+
+            jPopupMenu.add("string");
+            jPopupMenu.add(new AbstractAction("action") {
+                @Override
+                public void actionPerformed(final ActionEvent e) {
+                }
+            });
+            jPopupMenu.add(new JLabel("label"));
+            jPopupMenu.add(new JMenuItem("MenuItem"));
+            label.addMouseListener(new MouseAdapter() {
+                @Override
+                public void mouseReleased(final MouseEvent e) {
+                    jPopupMenu.show(label, 0, 0);
+                }
+            });
+
+            window.setBackground(new Color(0, 0, 0, 0));
+
+            window.setVisible(true);
+        });
+    }
+}