aboutsummaryrefslogtreecommitdiff
path: root/src/windows
diff options
context:
space:
mode:
authorAnton Tarasov <anton.tarasov@jetbrains.com>2016-05-05 12:29:17 +0300
committerAnton Tarasov <anton.tarasov@jetbrains.com>2016-05-05 12:29:17 +0300
commit975e33c206c43b06b2a520f6e7966648ff67ec63 (patch)
treefea71bf90ea4811d61aeddc80aa96c9b9bf630ca /src/windows
parent56b7431c799e6dc631d0fd811e8a19cca245b7a7 (diff)
downloadjdk8u_jdk-975e33c206c43b06b2a520f6e7966648ff67ec63.tar.gz
IDEA-139971 Cannot use IDEA and Dragon Naturally Speaking together
The bug mirrors Oracle bug: JDK-8140525. Comments: https://bugs.openjdk.java.net/browse/JDK-8140525?focusedCommentId=13865151&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13865151
Diffstat (limited to 'src/windows')
-rw-r--r--src/windows/native/sun/windows/awt_Frame.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/windows/native/sun/windows/awt_Frame.cpp b/src/windows/native/sun/windows/awt_Frame.cpp
index 53f6a50149..87a53fd789 100644
--- a/src/windows/native/sun/windows/awt_Frame.cpp
+++ b/src/windows/native/sun/windows/awt_Frame.cpp
@@ -484,7 +484,10 @@ MsgRouting AwtFrame::WmShowWindow(BOOL show, UINT status)
if (fgProcessID != ::GetCurrentProcessId()) {
AwtWindow* window = (AwtWindow*)GetComponent(GetHWnd());
- if (window != NULL && window->IsFocusableWindow() && window->IsAutoRequestFocus() &&
+ if (window != NULL &&
+ window->IsFocusableWindow() &&
+ window->IsAutoRequestFocus() &&
+ !::IsWindowVisible(GetHWnd()) && // the window is really showing
!::IsWindow(GetModalBlocker(GetHWnd())))
{
// When the Java process is not allowed to set the foreground window