infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-23 08:45:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

8006417: JComboBox.showPopup(), hidePopup() fails in JRE 1.7 on OS X

Browse Source 
Reviewed-by: art, serb
This commit is contained in:
Anton Litvinov 2013-01-18 18:34:46 +04:00
parent db0f450d53
commit ca94a86847
3 changed files with 89 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/src/macosx/classes/sun/lwawt/LWToolkit.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 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
@ -539,7 +539,7 @@ public abstract class LWToolkit extends SunToolkit implements Runnable {
@Override
public void ungrab(Window w) {
if (w.getPeer() != null) {
((LWWindowPeer)w.getPeer()).ungrab();
((LWWindowPeer)w.getPeer()).ungrab(false);
}
}
}

12
jdk/src/macosx/classes/sun/lwawt/LWWindowPeer.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 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
@ -1208,13 +1208,19 @@ public class LWWindowPeer
grabbingWindow = this;
}
void ungrab() {
final void ungrab(boolean doPost) {
if (isGrabbing()) {
grabbingWindow = null;
postEvent(new UngrabEvent(getTarget()));
if (doPost) {
postEvent(new UngrabEvent(getTarget()));
}
}
}
void ungrab() {
ungrab(true);
}
private boolean isGrabbing() {
return this == grabbingWindow;
}

78
jdk/test/javax/swing/JComboBox/ShowPopupAfterHidePopupTest/ShowPopupAfterHidePopupTest.java Normal file
View File

@ -0,0 +1,78 @@
/*
* 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 8006417
@summary JComboBox.showPopup(), hidePopup() fails in JRE 1.7 on OS X
@author Anton Litvinov
*/
import java.awt.*;
import javax.swing.*;
import javax.swing.plaf.metal.*;
import sun.awt.SunToolkit;
public class ShowPopupAfterHidePopupTest {
private static JFrame frame = null;
private static JComboBox comboBox = null;
private static boolean popupIsVisible = false;
public static void main(String[] args) throws Exception {
UIManager.setLookAndFeel(new MetalLookAndFeel());
SwingUtilities.invokeAndWait(new Runnable() {
@Override
public void run() {
frame = new JFrame("Popup Menu of JComboBox");
comboBox = new JComboBox(new String[]{"Item1", "Item2", "Item3"});
frame.getContentPane().add(comboBox);
frame.pack();
frame.setVisible(true);
}
});
final SunToolkit toolkit = (SunToolkit)Toolkit.getDefaultToolkit();
toolkit.realSync();
SwingUtilities.invokeAndWait(new Runnable() {
@Override
public void run() {
comboBox.showPopup();
comboBox.hidePopup();
comboBox.showPopup();
}
});
toolkit.realSync();
SwingUtilities.invokeAndWait(new Runnable() {
@Override
public void run() {
popupIsVisible = comboBox.isPopupVisible();
frame.dispose();
}
});
if (!popupIsVisible) {
throw new RuntimeException("Calling hidePopup() affected the next call to showPopup().");
}
}
}