michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed grabFocus to work when a parented Display is first shown.

This commit is contained in:
Ioannis Tsakpinis 2013-10-30 16:26:53 +02:00
parent 4ff2240b57
commit 59a9a970b9
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/java/org/lwjgl/opengl/WindowsDisplay.java
View File

@ -270,15 +270,10 @@ final class WindowsDisplay implements DisplayImplementation {
parent.addFocusListener(parent_focus_tracker = new FocusAdapter() {
public void focusGained(FocusEvent e) {
parent_focused.set(true);
// This is needed so that the last focused component AWT remembers is NOT our Canvas
WindowsDisplay.this.parent.setFocusable(false);
WindowsDisplay.this.parent.setFocusable(true);
// Clear AWT focus owner
KeyboardFocusManager.getCurrentKeyboardFocusManager().clearGlobalFocusOwner();
clearAWTFocus();
}
});
clearAWTFocus();
}
grabFocus();
} catch (LWJGLException e) {
@ -397,6 +392,15 @@ final class WindowsDisplay implements DisplayImplementation {
private static native void setForegroundWindow(long hwnd);
private static native void setFocus(long hwnd);
private void clearAWTFocus() {
// This is needed so that the last focused component AWT remembers is NOT our Canvas
WindowsDisplay.this.parent.setFocusable(false);
WindowsDisplay.this.parent.setFocusable(true);
// Clear AWT focus owner
KeyboardFocusManager.getCurrentKeyboardFocusManager().clearGlobalFocusOwner();
}
private void grabFocus() {
if ( parent == null )
setFocus(getHwnd());