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

8140525: AwtFrame::WmShowWindow() may steal focus

Browse Source 
Reviewed-by: serb, ssadetsky
This commit is contained in:
Anton Tarasov 2016-11-23 18:48:02 +03:00
parent ba274b43ec
commit 9d87230fcc
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp
View File

@ -484,7 +484,10 @@ MsgRouting AwtFrame::WmShowWindow(BOOL show, UINT status)
if (fgProcessID != ::GetCurrentProcessId()) { if (fgProcessID != ::GetCurrentProcessId()) {
AwtWindow* window = (AwtWindow*)GetComponent(GetHWnd()); 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()))) !::IsWindow(GetModalBlocker(GetHWnd())))
{ {
// When the Java process is not allowed to set the foreground window // When the Java process is not allowed to set the foreground window