提交 0f8e4469 编写于 作者: A ant

6886678: Clicking on parent JFrame's client area does not switch focus from...

6886678: Clicking on parent JFrame's client area does not switch focus from JWindow to JFrame on Windows
Reviewed-by: dcherepanov, art
上级 e00c8b91
......@@ -2329,6 +2329,19 @@ MsgRouting AwtComponent::WmMouseDown(UINT flags, int x, int y, int button)
MSG msg;
InitMessage(&msg, lastMessage, flags, MAKELPARAM(x, y), x, y);
AwtWindow *toplevel = GetContainer();
if (toplevel && !toplevel->IsSimpleWindow()) {
/*
* The frame should be focused by click in case it is
* the active window but not the focused window. See 6886678.
*/
if (toplevel->GetHWnd() == ::GetActiveWindow() &&
toplevel->GetHWnd() != AwtComponent::GetFocusedWindow())
{
toplevel->AwtSetActiveWindow();
}
}
SendMouseEvent(java_awt_event_MouseEvent_MOUSE_PRESSED, now, x, y,
GetJavaModifiers(), clickCount, JNI_FALSE,
GetButton(button), &msg);
......
/*
* Copyright (c) 1995, 2010, 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. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* 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 FocusOwnerFrameOnClick.java %W% %E%
@bug 6886678
@summary Tests that clicking an owner frame switches focus from its owned window.
@author Anton Tarasov: area=awt.focus
@library ../../regtesthelpers
@build Util
@run main FocusOwnerFrameOnClick
*/
import java.awt.*;
import java.awt.event.*;
import java.applet.Applet;
import java.util.concurrent.atomic.AtomicBoolean;
import java.lang.reflect.InvocationTargetException;
import test.java.awt.regtesthelpers.Util;
public class FocusOwnerFrameOnClick extends Applet {
Robot robot;
Frame frame = new Frame("Frame");
Window window = new Window(frame);
Button fButton = new Button("fButton");
Button wButton = new Button("wButton");
AtomicBoolean focused = new AtomicBoolean(false);
public static void main(String[] args) {
FocusOwnerFrameOnClick app = new FocusOwnerFrameOnClick();
app.init();
app.start();
}
public void init() {
robot = Util.createRobot();
frame.setLayout(new FlowLayout());
frame.setSize(200, 200);
frame.add(fButton);
window.setLocation(300, 0);
window.add(wButton);
window.pack();
}
public void start() {
frame.setVisible(true);
Util.waitForIdle(robot);
window.setVisible(true);
Util.waitForIdle(robot);
if (!wButton.hasFocus()) {
if (!Util.trackFocusGained(wButton, new Runnable() {
public void run() {
Util.clickOnComp(wButton, robot);
}
}, 2000, false))
{
throw new TestErrorException("wButton didn't gain focus on showing");
}
}
Runnable clickAction = new Runnable() {
public void run() {
Point loc = fButton.getLocationOnScreen();
Dimension dim = fButton.getSize();
robot.mouseMove(loc.x, loc.y + dim.height + 20);
robot.delay(50);
robot.mousePress(InputEvent.BUTTON1_MASK);
robot.delay(50);
robot.mouseRelease(InputEvent.BUTTON1_MASK);
}
};
if (!Util.trackWindowGainedFocus(frame, clickAction, 2000, true)) {
throw new TestFailedException("The frame wasn't focused on click");
}
System.out.println("Test passed.");
}
}
/**
* Thrown when the behavior being verified is found wrong.
*/
class TestFailedException extends RuntimeException {
TestFailedException(String msg) {
super("Test failed: " + msg);
}
}
/**
* Thrown when an error not related to the behavior being verified is encountered.
*/
class TestErrorException extends RuntimeException {
TestErrorException(String msg) {
super("Unexpected error: " + msg);
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册