stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8050478: [macosx] Cursor not updating correctly after closing a modal dialog

Browse Source 
Reviewed-by: serb, alexsch
This commit is contained in:
Dmitry Markov 2016-09-01 22:17:48 +03:00
parent 6f12a4ff0d
commit 49b420e58a
3 changed files with 162 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
View File

@ -63,6 +63,7 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
private static native void nativeSetNSWindowRepresentedFilename(long nsWindowPtr, String representedFilename);
private static native void nativeSetEnabled(long nsWindowPtr, boolean isEnabled);
private static native void nativeSynthesizeMouseEnteredExitedEvents();
private static native void nativeSynthesizeMouseEnteredExitedEvents(long nsWindowPtr, int eventType);
private static native void nativeDispose(long nsWindowPtr);
private static native void nativeEnterFullScreenMode(long nsWindowPtr);
private static native void nativeExitFullScreenMode(long nsWindowPtr);
@ -825,6 +826,13 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
return;
}
if (blocked) {
// We are going to show a modal window. Previously displayed window will be
// blocked/disabled. So we have to send mouse exited event to it now, since
// all mouse events are discarded for blocked/disabled windows.
nativeSynthesizeMouseEnteredExitedEvents(getNSWindowPtr(), CocoaConstants.NSMouseExited);
}
nativeSetEnabled(getNSWindowPtr(), !blocked);
checkBlockingAndOrder();
}

27
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m
View File

@ -1333,9 +1333,9 @@ JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeGetTopmostPlatformWindowUnde
/*
* Class: sun_lwawt_macosx_CPlatformWindow
* Method: nativeSynthesizeMouseEnteredExitedEvents
* Signature: (J)V
* Signature: ()V
*/
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSynthesizeMouseEnteredExitedEvents
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSynthesizeMouseEnteredExitedEvents__
(JNIEnv *env, jclass clazz)
{
JNF_COCOA_ENTER(env);
@ -1347,6 +1347,29 @@ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSynthesizeMou
JNF_COCOA_EXIT(env);
}
/*
* Class: sun_lwawt_macosx_CPlatformWindow
* Method: nativeSynthesizeMouseEnteredExitedEvents
* Signature: (JI)V
*/
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSynthesizeMouseEnteredExitedEvents__JI
(JNIEnv *env, jclass clazz, jlong windowPtr, jint eventType)
{
JNF_COCOA_ENTER(env);
if (eventType == NSMouseEntered || eventType == NSMouseExited) {
NSWindow *nsWindow = OBJC(windowPtr);
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[AWTWindow synthesizeMouseEnteredExitedEvents:nsWindow withType:eventType];
}];
} else {
[JNFException raise:env as:kIllegalArgumentException reason:"unknown event type"];
}
JNF_COCOA_EXIT(env);
}
/*
* Class: sun_lwawt_macosx_CPlatformWindow
* Method: _toggleFullScreenMode

129
jdk/test/java/awt/Mouse/EnterExitEvents/ModalDialogEnterExitEventsTest.java Normal file
View File

@ -0,0 +1,129 @@
/*
* Copyright (c) 2016, 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
* @key headful
* @bug 8050478
* @summary Cursor not updating correctly after closing a modal dialog.
* The root cause of the issue was the lack of a mouse exit event
* during displaying of a modal dialog.
* @author Dmitry Markov
* @library ../../regtesthelpers
* @build Util
* @run main ModalDialogEnterExitEventsTest
*/
import javax.swing.JButton;
import javax.swing.JDialog;
import javax.swing.JFrame;
import javax.swing.SwingUtilities;
import java.awt.FlowLayout;
import java.awt.Frame;
import java.awt.Robot;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.concurrent.atomic.AtomicInteger;
import test.java.awt.regtesthelpers.Util;
public class ModalDialogEnterExitEventsTest {
private static volatile AtomicInteger mouseEnterCount = new AtomicInteger();
private static volatile AtomicInteger mouseExitCount = new AtomicInteger();
private static JFrame frame;
private static JButton openButton;
private static JButton closeButton;
public static void main(String[] args) {
Robot robot = Util.createRobot();
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
createAndShowGUI();
}
});
Util.waitForIdle(robot);
Util.clickOnComp(frame, robot, 500);
Util.waitForIdle(robot);
mouseEnterCount.set(0);
mouseExitCount.set(0);
Util.clickOnComp(openButton, robot, 500);
Util.waitForIdle(robot);
if (mouseExitCount.get() != 1) {
throw new RuntimeException("Test FAILED. Wrong number of MouseExited events = " + mouseExitCount.get());
}
Util.clickOnComp(closeButton, robot, 500);
Util.waitForIdle(robot);
if (mouseEnterCount.get() != 1) {
throw new RuntimeException("Test FAILED. Wrong number of MouseEntered events = "+ mouseEnterCount.get());
}
}
private static void createAndShowGUI() {
frame = new JFrame("ModalDialogEnterExitEventsTest");
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
frame.setLayout(new FlowLayout());
frame.addMouseListener(new MouseAdapter() {
@Override
public void mouseExited(MouseEvent e) {
mouseExitCount.getAndIncrement();
}
@Override
public void mouseEntered(MouseEvent e) {
mouseEnterCount.getAndIncrement();
}
});
openButton = new JButton("Open Dialog");
openButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
JDialog dialog = new JDialog(frame, "Modal Dialog", true);
dialog.setLayout(new FlowLayout());
closeButton = new JButton("Close");
closeButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
dialog.dispose();
}
});
dialog.add(closeButton);
dialog.setSize(200, 200);
dialog.setLocationRelativeTo(null);
dialog.setVisible(true);
}
});
frame.add(openButton);
frame.setExtendedState(Frame.MAXIMIZED_BOTH);
frame.setVisible(true);
}
}