infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-11 07:28:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

7145827: [macosx] JCK failure in b11: FocusableWindow3

Browse Source 
Forward posrt from 7u4

Reviewed-by: art
This commit is contained in:
Anton Tarasov 2012-05-17 22:21:27 +04:00
parent 09df642ee8
commit 4a46c4fa60
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
jdk/src/macosx/classes/sun/lwawt/LWWindowPeer.java
View File

@ -101,8 +101,6 @@ public class LWWindowPeer
// events between MOUSE_PRESSED and MOUSE_RELEASED for particular button
private static int mouseClickButtons = 0;
private volatile boolean cachedFocusableWindow;
private volatile boolean isOpaque = true;
private static final Font DEFAULT_FONT = new Font("Lucida Grande", Font.PLAIN, 13);
@ -172,8 +170,6 @@ public class LWWindowPeer
setAlwaysOnTop(getTarget().isAlwaysOnTop());
updateMinimumSize();
cachedFocusableWindow = getTarget().isFocusableWindow();
setOpacity(getTarget().getOpacity());
setOpaque(getTarget().isOpaque());
@ -402,7 +398,6 @@ public class LWWindowPeer
@Override
public void updateFocusableWindowState() {
cachedFocusableWindow = getTarget().isFocusableWindow();
platformWindow.updateFocusableWindowState();
}
@ -1130,7 +1125,19 @@ public class LWWindowPeer
private boolean focusAllowedFor() {
Window window = getTarget();
// TODO: check if modal blocked
return window.isVisible() && window.isEnabled() && window.isFocusableWindow();
return window.isVisible() && window.isEnabled() && isFocusableWindow();
}
private boolean isFocusableWindow() {
boolean focusable = getTarget().isFocusableWindow();
if (isSimpleWindow()) {
LWWindowPeer ownerPeer = getOwnerFrameDialog(this);
if (ownerPeer == null) {
return false;
}
return focusable && ownerPeer.getTarget().isFocusableWindow();
}
return focusable;
}
public boolean isSimpleWindow() {
@ -1150,8 +1157,8 @@ public class LWWindowPeer
skipNextFocusChange = false;
return;
}
if (!cachedFocusableWindow) {
if (!isFocusableWindow() && becomesFocused) {
focusLog.fine("the window is not focusable");
return;
}
if (becomesFocused) {