Mercurial > hg > icedtea8-forest > jdk
changeset 13385:dcd2081a3118 jdk8u152-b34
8179665: [Windows] java.awt.IllegalComponentStateException: component must be showing on the screen to determine its location
Reviewed-by: prr, serb, ssadetsky
author | aivanov |
---|---|
date | Wed, 06 Dec 2017 13:04:58 +0000 |
parents | 0bec6e881967 |
children | 9828d410e76e |
files | src/windows/classes/sun/awt/windows/WInputMethod.java src/windows/native/sun/windows/awt_Component.cpp test/javax/swing/JFrame/AlwaysOnTop/AlwaysOnTopImeTest.java |
diffstat | 3 files changed, 70 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/windows/classes/sun/awt/windows/WInputMethod.java Sat Dec 02 14:28:42 2017 +0000 +++ b/src/windows/classes/sun/awt/windows/WInputMethod.java Wed Dec 06 13:04:58 2017 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, 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 @@ -584,6 +584,9 @@ Component client = getClientComponent(); if (client != null) { + if (!client.isShowing()) { + return; + } if (haveActiveClient()) { Rectangle rc = inputContext.getTextLocation(TextHitInfo.leading(0)); x = rc.x;
--- a/src/windows/native/sun/windows/awt_Component.cpp Sat Dec 02 14:28:42 2017 +0000 +++ b/src/windows/native/sun/windows/awt_Component.cpp Wed Dec 06 13:04:58 2017 +0000 @@ -3779,6 +3779,9 @@ UINT bits = 1; POINT p = {0, 0}; // upper left corner of the client area HWND hWnd = GetHWnd(); + if (!::IsWindowVisible(hWnd)) { + return; + } HWND hTop = GetTopLevelParentForWindow(hWnd); ::ClientToScreen(hTop, &p); if (!m_bitsCandType) { @@ -4051,6 +4054,9 @@ // void AwtComponent::InquireCandidatePosition() { + if (!::IsWindowVisible(GetHWnd())) { + return; + } JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2); // get global reference of WInputMethod class (run only once)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/javax/swing/JFrame/AlwaysOnTop/AlwaysOnTopImeTest.java Wed Dec 06 13:04:58 2017 +0000 @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2017, 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 8179665 + * @summary [Windows] java.awt.IllegalComponentStateException: component must + * be showing on the screen to determine its location + * @run main AlwaysOnTopImeTest + */ + +import javax.swing.*; +import java.awt.*; + +public class AlwaysOnTopImeTest { + + private static JDialog d; + private static JFrame f; + + public static void main(String[] args) throws Exception { + SwingUtilities.invokeLater(() -> { + f = new JFrame(); + f.setVisible(true); + d = new JDialog(f); + d.add(new JTextField()); + d.pack(); + d.setModal(true); + f.setAlwaysOnTop(true); + d.setVisible(true); + f.setAlwaysOnTop(false); + }); + Robot robot = new Robot(); + robot.waitForIdle(); + robot.delay(200); + SwingUtilities.invokeAndWait(() -> d.setVisible(false)); + robot.waitForIdle(); + robot.delay(200); + SwingUtilities.invokeLater(f::dispose); + } +}